Commit adcfa91d authored by Jiwon Yoon's avatar Jiwon Yoon
Browse files

merge-jiwon,subin

parent e1796752
...@@ -15,10 +15,10 @@ import TicketingPage from "./pages/TicketingPage"; ...@@ -15,10 +15,10 @@ import TicketingPage from "./pages/TicketingPage";
function App() { function App() {
return ( return (
// <div className="" style={{ backgroundColor: "black" }}> <div className="" style={{ backgroundColor: "black" }}>
// <SubNav /> <SubNav />
// <Header /> <Header />
// <MainNav /> <MainNav />
<Router> <Router>
<Switch> <Switch>
<Route exact path="/" component={HomePage} /> <Route exact path="/" component={HomePage} />
...@@ -30,7 +30,7 @@ function App() { ...@@ -30,7 +30,7 @@ function App() {
<Route path="/admin" component={AdminPage}/> <Route path="/admin" component={AdminPage}/>
</Switch> </Switch>
</Router> </Router>
// </div> </div>
); );
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment