Update alert.js

2023-05-08 16:44:52 +00:00
parent 6d5a8097e0
commit 2f01741f32
1 changed files with 0 additions and 4 deletions
@@ -9,8 +9,4 @@ export const setAlert = (msg, alertType, timeout = 5000) => dispatch => {
  });

  setTimeout(() => dispatch({ type: REMOVE_ALERT, payload: id }), timeout);
-<<<<<<< HEAD
 };
-=======
-};
->>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb