From 3a8c73838dec017e59d2f457988c187a01d8b25a Mon Sep 17 00:00:00 2001
From: Andrean <88448470+QkoSad@users.noreply.github.com>
Date: Mon, 8 May 2023 16:46:03 +0000
Subject: [PATCH] Update auth.js

---
 client/src/reducers/auth.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/client/src/reducers/auth.js b/client/src/reducers/auth.js
index 02537f6..d9ab5c0 100644
--- a/client/src/reducers/auth.js
+++ b/client/src/reducers/auth.js
@@ -50,8 +50,6 @@ function authReducer(state = initialState, action) {
   }
 }
 
-<<<<<<< HEAD
+
 export default authReducer;
-=======
-export default authReducer;
->>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb
+