ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-01-19 19:27:07 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

resolve conflicts

Browse Source
This commit is contained in:
Scott Bell 2023-05-19 16:16:34 +02:00
commit efb55ecafc
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.circleci/config.yml
View File

@ -232,9 +232,9 @@ jobs:
workflows:
overall-circleci-commit-status: #These jobs run on every commit
jobs:
# - lint:
# name: node16-lint
# node-version: lts/gallium
- lint:
name: node16-lint
node-version: lts/gallium
- unit-test:
name: node18-chrome
node-version: lts/hydrogen

6
.git-blame-ignore-revs
View File

@ -4,3 +4,9 @@
# Requires Git > 2.23
# See https://git-scm.com/docs/git-blame#Documentation/git-blame.txt---ignore-revs-fileltfilegt
# Copyright year update 2022
4a9744e916d24122a81092f6b7950054048ba860
# Copyright year update 2023
8040b275fcf2ba71b42cd72d4daa64bb25c19c2d
# Apply `prettier` formatting
caa7bc6faebc204f67aedae3e35fb0d0d3ce27a7