Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/feat(tournament)/endpoints' into…
Browse files Browse the repository at this point in the history
… feat(tournament)/endpoints

# Conflicts:
#	package-lock.json
#	package.json
  • Loading branch information
lille-morille committed Apr 15, 2024
2 parents 33987dd + e30e2c7 commit 73ba000
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,18 @@
"@radix-ui/react-label": "^2.0.2",
"@radix-ui/react-separator": "^1.0.3",
"@radix-ui/react-slot": "^1.0.2",
"@tanstack/react-query": "^5.29.2",
"@radix-ui/react-switch": "^1.0.3",
"@radix-ui/react-tooltip": "^1.0.7",
"@tanstack/react-query": "^5.29.2",
"axios": "^1.5.1",
"class-variance-authority": "^0.7.0",
"clsx": "^2.1.0",
"cookie": "^0.5.0",
"js-cookie": "^3.0.5",
"lucide-react": "^0.307.0",
"next": "13.5.4",
"query-string": "^8.1.0",
"next-themes": "^0.2.1",
"query-string": "^8.1.0",
"react": "^18",
"react-dom": "^18",
"react-hook-form": "^7.49.3",
Expand Down

0 comments on commit 73ba000

Please sign in to comment.