javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: remove additional merge conflict markers

Browse Source
This commit is contained in:
Liam DeBeasi
2024-03-20 09:53:33 -04:00
parent 8c56b0b94a
commit 8c578da8cb
2 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/vue/package-lock.json generated
View File

@@ -208,15 +208,9 @@
"dev": true
},
"node_modules/@ionic/core": {
<<<<<<< HEAD
"version": "8.0.0-dev.11709632212.139b6f63",
"resolved": "https://registry.npmjs.org/@ionic/core/-/core-8.0.0-dev.11709632212.139b6f63.tgz",
"integrity": "sha512-NV/dwHkL+8TDT6cyslJoAJTEPD8Er+CEtA900DUZAe13Y5JntW4eWrH9uWKfhL4ZxAKaug/KdjoENXaa7TPc0A==",
=======
"version": "7.8.1",
"resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.8.1.tgz",
"integrity": "sha512-SsoDy0HaifCcWBlcyRIpTceboz6tSg4gjNr/LRGJyg+r2bWdoG3jeuQDg0Affox8dar7QvODk3AWO/7RFWLOfg==",
>>>>>>> origin/main
"dependencies": {
"@stencil/core": "^4.12.2",
"ionicons": "^7.2.2",
@@ -3965,15 +3959,9 @@
"dev": true
},
"@ionic/core": {
<<<<<<< HEAD
"version": "8.0.0-dev.11709632212.139b6f63",
"resolved": "https://registry.npmjs.org/@ionic/core/-/core-8.0.0-dev.11709632212.139b6f63.tgz",
"integrity": "sha512-NV/dwHkL+8TDT6cyslJoAJTEPD8Er+CEtA900DUZAe13Y5JntW4eWrH9uWKfhL4ZxAKaug/KdjoENXaa7TPc0A==",
=======
"version": "7.8.1",
"resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.8.1.tgz",
"integrity": "sha512-SsoDy0HaifCcWBlcyRIpTceboz6tSg4gjNr/LRGJyg+r2bWdoG3jeuQDg0Affox8dar7QvODk3AWO/7RFWLOfg==",
>>>>>>> origin/main
"requires": {
"@stencil/core": "^4.12.2",
"ionicons": "^7.2.2",

4
packages/vue/package.json
View File

@@ -66,11 +66,7 @@
"vue-router": "^4.0.16"
},
"dependencies": {
<<<<<<< HEAD
"@ionic/core": "^8.0.0-beta.2",
=======
"@ionic/core": "^7.8.1",
>>>>>>> origin/main
"ionicons": "^7.0.0"
},
"vetur": {