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

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

diff --git a/client/src/components/layout/Alert.js b/client/src/components/layout/Alert.js
index 97349bf..54620cf 100644
--- a/client/src/components/layout/Alert.js
+++ b/client/src/components/layout/Alert.js
@@ -20,8 +20,4 @@ const mapStateToProps = (state) => ({
   alerts: state.alert
 });
 
-<<<<<<< HEAD
 export default connect(mapStateToProps)(Alert);
-=======
-export default connect(mapStateToProps)(Alert);
->>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb