Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
# Conflicts:
#	package.json
#	packages/standard-api-fastify/package.json
#	packages/standard-linter/package.json
#	packages/standard-prettier/package.json
#	packages/standard-web-linter/package.json
#	pnpm-lock.yaml
  • Loading branch information
thedoublejay committed Aug 26, 2024
2 parents 845a5c4 + 4cd4048 commit 910a34f
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions packages/standard-web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
"dependencies": {
"@next/third-parties": "^14.2.5",
"@ordzaar/standard-typescript": "workspace:*",
"@reduxjs/toolkit": "^2.2.6",
"@tanstack/react-query": "^5.51.14",
"@reduxjs/toolkit": "^2.2.7",
"@tanstack/react-query": "^5.51.23",
"@types/react": "18.3.3",
"@types/react-dom": "18.3.0",
"next": "14.2.5",
"next-sitemap": "^4.2.3",
"nextjs-progressbar": "^0.0.16",
"react": "18.3.1",
"react-dom": "18.3.1",
"react-icons": "^5.2.1",
"react-icons": "^5.3.0",
"react-redux": "^9.1.2",
"react-responsive": "^10.0.0"
}
Expand Down

0 comments on commit 910a34f

Please sign in to comment.