Skip to content

Commit

Permalink
Merge branch 'main' into update-deps
Browse files Browse the repository at this point in the history
 Conflicts:
	package.json
	pnpm-lock.yaml
  • Loading branch information
arrow2nd committed Dec 19, 2024
2 parents 0855063 + b070750 commit 07e8179
Show file tree
Hide file tree
Showing 2 changed files with 3,288 additions and 1,206 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"create:colors": "ts-node ./tools/create-colors.ts"
},
"dependencies": {
"next": "15.1.1",
"next": "15.1.2",
"react": "19.0.0",
"react-device-detect": "^2.2.3",
"react-dom": "19.0.0",
Expand Down Expand Up @@ -42,7 +42,7 @@
"color-classifier": "^0.0.1",
"color-convert": "^2.0.1",
"eslint": "9.17.0",
"eslint-config-next": "15.1.1",
"eslint-config-next": "15.1.2",
"eslint-config-prettier": "^9.1.0",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
Expand Down
Loading

0 comments on commit 07e8179

Please sign in to comment.