From 07fa7b36206640620e75ac7d883bb49669a7c307 Mon Sep 17 00:00:00 2001
From: Andrean <88448470+QkoSad@users.noreply.github.com>
Date: Mon, 8 May 2023 16:54:04 +0000
Subject: [PATCH] Update store.js

---
 client/src/store.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/client/src/store.js b/client/src/store.js
index f6169e9..c453748 100644
--- a/client/src/store.js
+++ b/client/src/store.js
@@ -36,8 +36,5 @@ store.subscribe(() => {
   }
 });
 
-<<<<<<< HEAD
 export default store;
-=======
-export default store;
->>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb
+