javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-15 17:42:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix package.json merge conflict

Browse Source
This commit is contained in:
Liam DeBeasi
2024-01-25 13:16:22 -05:00
parent 594925ea78
commit 14c8e826c2
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/react-router/package.json
View File

@ -35,12 +35,8 @@
"dist/" "dist/"
], ],
"dependencies": { "dependencies": {
<<<<<<< HEAD
"@ionic/react": "^7.6.2",
"history": "^4.9.0",
=======
"@ionic/react": "^7.6.6", "@ionic/react": "^7.6.6",
>>>>>>> origin/main "history": "^4.9.0",
"tslib": "*" "tslib": "*"
}, },
"peerDependencies": { "peerDependencies": {