Skip to content

Commit

Permalink
chore: fix merge conflicts from old ui package.json to new
Browse files Browse the repository at this point in the history
  • Loading branch information
georgeherby committed Feb 25, 2024
2 parents 385354b + 64581a2 commit ee930af
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 23 deletions.
42 changes: 21 additions & 21 deletions server/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
"@types/node": "20.11.20",
"@typescript-eslint/eslint-plugin": "7.0.2",
"@typescript-eslint/parser": "7.0.2",
"eslint": "8.56.0",
"eslint": "8.57.0",
"eslint-import-resolver-typescript": "3.6.1",
"eslint-plugin-deprecation": "2.0.0",
"eslint-plugin-import": "2.29.1",
"eslint-plugin-unicorn": "51.0.1",
"jest": "29.7.0",
"nodemon": "3.0.3",
"nodemon": "3.1.0",
"ts-jest": "29.1.2",
"ts-node": "10.9.2",
"typescript": "5.3.3"
Expand Down

0 comments on commit ee930af

Please sign in to comment.