From d376c743f7755955cce45d321a894cde5ad56e15 Mon Sep 17 00:00:00 2001
From: Andrean <88448470+QkoSad@users.noreply.github.com>
Date: Mon, 8 May 2023 16:59:25 +0000
Subject: [PATCH] Update Spinner.js

---
 client/src/components/layout/Spinner.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/client/src/components/layout/Spinner.js b/client/src/components/layout/Spinner.js
index bc61086..d4255c3 100644
--- a/client/src/components/layout/Spinner.js
+++ b/client/src/components/layout/Spinner.js
@@ -11,8 +11,4 @@ const Spinner = () => (
   </Fragment>
 );
 
-<<<<<<< HEAD
 export default Spinner;
-=======
-export default Spinner;
->>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb