Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev' into dev
Browse files Browse the repository at this point in the history
# Conflicts:
#	package-lock.json
  • Loading branch information
TychoTheTaco committed May 1, 2022
2 parents 37b48cd + 590faf3 commit 2b7df9d
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@
"@types/prompt": "^1.1.2",
"@types/react": "^17.0.41",
"@types/uuid": "^8.3.4",
"@typescript-eslint/eslint-plugin": "^5.19.0",
"@typescript-eslint/parser": "^5.19.0",
"@typescript-eslint/eslint-plugin": "^5.20.0",
"@typescript-eslint/parser": "^5.20.0",
"depcheck": "^1.4.3",
"eslint": "^8.13.0",
"eslint-plugin-jest": "^26.1.4",
"eslint-plugin-jest": "^26.1.5",
"eslint-plugin-react": "^7.29.4",
"eslint-plugin-unused-imports": "^2.0.0",
"husky": "^7.0.0",
Expand Down

0 comments on commit 2b7df9d

Please sign in to comment.