Skip to content

Commit 8c578da

Browse files
committed
chore: remove additional merge conflict markers
1 parent 8c56b0b commit 8c578da

File tree

2 files changed

+0
-16
lines changed

2 files changed

+0
-16
lines changed

packages/vue/package-lock.json

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

packages/vue/package.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,7 @@
6666
"vue-router": "^4.0.16"
6767
},
6868
"dependencies": {
69-
<<<<<<< HEAD
7069
"@ionic/core": "^8.0.0-beta.2",
71-
=======
72-
"@ionic/core": "^7.8.1",
73-
>>>>>>> origin/main
7470
"ionicons": "^7.0.0"
7571
},
7672
"vetur": {

0 commit comments

Comments
 (0)