From 51e42d0ee8cd4a623ebdcaa38c5ba8380f452242 Mon Sep 17 00:00:00 2001
From: Andrean <88448470+QkoSad@users.noreply.github.com>
Date: Mon, 8 May 2023 16:45:49 +0000
Subject: [PATCH] Update alert.js

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

diff --git a/client/src/reducers/alert.js b/client/src/reducers/alert.js
index b66b181..484d232 100644
--- a/client/src/reducers/alert.js
+++ b/client/src/reducers/alert.js
@@ -15,8 +15,5 @@ function alertReducer(state = initialState, action) {
   }
 }
 
-<<<<<<< HEAD
+
 export default alertReducer;
-=======
-export default alertReducer;
->>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb