From 14c8e826c20d9f8772771bcdffd786264bab72f3 Mon Sep 17 00:00:00 2001
From: Liam DeBeasi <liamdebeasi@users.noreply.github.com>
Date: Thu, 25 Jan 2024 13:16:22 -0500
Subject: [PATCH] chore: fix package.json merge conflict

---
 packages/react-router/package.json | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/react-router/package.json b/packages/react-router/package.json
index 585d3ac504..5057457a5b 100644
--- a/packages/react-router/package.json
+++ b/packages/react-router/package.json
@@ -35,12 +35,8 @@
     "dist/"
   ],
   "dependencies": {
-<<<<<<< HEAD
-    "@ionic/react": "^7.6.2",
-    "history": "^4.9.0",
-=======
     "@ionic/react": "^7.6.6",
->>>>>>> origin/main
+    "history": "^4.9.0",
     "tslib": "*"
   },
   "peerDependencies": {