Skip to content

Commit 2072177

Browse files
committed
Merge remote-tracking branch 'origin/dependabot/npm_and_yarn/react-router-dom-7.0.2' into dependabot/npm_and_yarn/react-router-dom-7.0.2
# Conflicts: # package-lock.json # package.json
2 parents e6a9c6b + 968a3fa commit 2072177

File tree

8 files changed

+117
-67
lines changed

8 files changed

+117
-67
lines changed

package-lock.json

Lines changed: 102 additions & 53 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"react-countdown": "^2.3.6",
2727
"react-dom": "^18.3.1",
2828
"react-query": "^3.39.2",
29-
"react-router": "^7.0.2",
29+
"react-router-dom": "^7.0.2",
3030
"react-scripts": "5.0.1",
3131
"react-use": "^17.5.1",
3232
"sass": "^1.81.0",
@@ -95,7 +95,7 @@
9595
"@types/styled-components": "^5.1.34",
9696
"eslint": "^8.57.1",
9797
"gh-pages": "^6.2.0",
98-
"prettier": "^3.3.3",
98+
"prettier": "^3.4.2",
9999
"react-ga": "^3.3.1",
100100
"react-test-renderer": "^18.3.1"
101101
},
134 Bytes
Loading

public/images/devbcn25.png

902 KB
Loading

0 commit comments

Comments
 (0)