fix: merge conflicts

This commit is contained in:
rngsurrounded
2025-03-01 20:17:18 +09:00
19 changed files with 199 additions and 64 deletions
+1 -1
View File
@@ -2,7 +2,7 @@ import { Routes, Route } from "react-router";
import "./styles/globals.css";
import Competitions from "./pages/Competitions";
import CompetitionPreview from './pages/CompetitionPreview'
import CompetitionSession from "./pages/CompetitionSesssion";
import CompetitionSession from "./pages/CompetitionSession";
import { NavbarLayout } from "./widgets/navbar-layout";
const App = () => {