Fixing after react update

2023-05-05 23:10:06 +03:00
parent 21fa38cc4d
commit d069e56397
45 changed files with 550 additions and 31 deletions
@@ -9,4 +9,8 @@ export const setAlert = (msg, alertType, timeout = 5000) => dispatch => {
  });

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