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

---
 client/src/actions/alert.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/client/src/actions/alert.js b/client/src/actions/alert.js
index 43fec4a..d4dc613 100644
--- a/client/src/actions/alert.js
+++ b/client/src/actions/alert.js
@@ -9,8 +9,4 @@ export const setAlert = (msg, alertType, timeout = 5000) => dispatch => {
   });
 
   setTimeout(() => dispatch({ type: REMOVE_ALERT, payload: id }), timeout);
-<<<<<<< HEAD
 };
-=======
-};
->>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb