From c15d409d22465628033429986c081cb83d9874f5 Mon Sep 17 00:00:00 2001
From: Andrean <88448470+QkoSad@users.noreply.github.com>
Date: Mon, 8 May 2023 17:10:11 +0000
Subject: [PATCH] Update PrivateRoute.js

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

diff --git a/client/src/components/routing/PrivateRoute.js b/client/src/components/routing/PrivateRoute.js
index 70a7af5..c1fbe83 100644
--- a/client/src/components/routing/PrivateRoute.js
+++ b/client/src/components/routing/PrivateRoute.js
@@ -22,8 +22,5 @@ const mapStateToProps = (state) => ({
   auth: state.auth
 });
 
-<<<<<<< HEAD
+
 export default connect(mapStateToProps)(PrivateRoute);
-=======
-export default connect(mapStateToProps)(PrivateRoute);
->>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb