From 8c578da8cbb301fa62c7ee0efd59a5abf56ed997 Mon Sep 17 00:00:00 2001
From: Liam DeBeasi <liamdebeasi@users.noreply.github.com>
Date: Wed, 20 Mar 2024 09:53:33 -0400
Subject: [PATCH] chore: remove additional merge conflict markers

---
 packages/vue/package-lock.json | 12 ------------
 packages/vue/package.json      |  4 ----
 2 files changed, 16 deletions(-)

diff --git a/packages/vue/package-lock.json b/packages/vue/package-lock.json
index 07ff44c7e3..41ba1e8db7 100644
--- a/packages/vue/package-lock.json
+++ b/packages/vue/package-lock.json
@@ -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",
diff --git a/packages/vue/package.json b/packages/vue/package.json
index d7723eaa30..c331120a40 100644
--- a/packages/vue/package.json
+++ b/packages/vue/package.json
@@ -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": {