Skip to content

Commit

Permalink
Resolve merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
mapeveri committed Mar 12, 2024
2 parents 59ab4e4 + 2ced1e6 commit ecff0aa
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
run: npm ci
- name: Run linter check
run: npm run linter-check
- name: Run format-code check
- name: Run format code check
run: npm run format-code-check
- name: Run tests
- name: Run unit tests
run: npm run test:unit
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
# stryker temp files
.stryker-tmp
/reports/
/coverage/
stryker.log
.idea

Expand Down

0 comments on commit ecff0aa

Please sign in to comment.