resolving conflicts

This commit is contained in:
Caio Cabral committed 2024-12-12 09:15:39 -05:00
commit 788ffc92c8
48 files changed
+593 -580

No files matched your search

-1
View File
@@ -3,7 +3,6 @@ import { useSelector } from "react-redux";
import { useDispatch } from "react-redux";
import "react-toastify/dist/ReactToastify.css";
import { ToastContainer } from "react-toastify";
import { ThemeProvider } from "@emotion/react";
import lightTheme from "./Utils/Theme/lightTheme";
import darkTheme from "./Utils/Theme/darkTheme";