mirror/Checkmate
1
0
Fork 0
mirror of https://github.com/bluewave-labs/Checkmate.git synced 2026-01-21 00:59:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed conflicts.

Browse Source
This commit is contained in:
M M
2024-07-09 17:32:24 -07:00
parent 8d62da1b88
commit 2f63a13fb8
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Client/src/App.jsx
View File

@@ -18,11 +18,9 @@ import CheckEmail from "./Pages/CheckEmail";
import SetNewPassword from "./Pages/SetNewPassword";
import NewPasswordConfirmed from "./Pages/NewPasswordConfirmed";
import ProtectedRoute from "./Components/ProtectedRoute";
<<<<<<< HEAD
import Details from "./Pages/Details";
=======
import Maintenance from "./Pages/Maintenance";
>>>>>>> upstream/master
function App() {
return (