Skip to content
Snippets Groups Projects
Commit 0cb409ba authored by Aymeric Chaumont's avatar Aymeric Chaumont
Browse files

conflicts

parent c4d52464
Branches tp2-correction
No related tags found
2 merge requests!30Restaurants route,!28improve front
Show whitespace changes
Inline Side-by-side
Showing
with 0 additions and 4 deletions
backend/main.py
+ 0
− 4
View file @ 0cb409ba
...@@ -4,11 +4,7 @@ from dotenv import load_dotenv ...@@ -4,11 +4,7 @@ from dotenv import load_dotenv
import os import os
from db import database, models from db import database, models
<<<<<<< HEAD
from routers import stats, comments, news, restaurants from routers import stats, comments, news, restaurants
=======
from routers import stats, comments, news, opening_hours, restaurants
>>>>>>> added /api/restaurants route
app = FastAPI(docs_url="/api/docs", openapi_url="/api/openapi.json") app = FastAPI(docs_url="/api/docs", openapi_url="/api/openapi.json")
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment