Skip to content

Commit fa1f7fa

Browse files
committed
clean after rebase
1 parent 2516879 commit fa1f7fa

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

src/server/routers/dynamic.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,4 @@ async def catch_all(request: Request, full_path: str) -> HTMLResponse:
3636
"repo_url": full_path,
3737
"default_file_size": 243,
3838
},
39-
<<<<<<< HEAD
4039
)
41-
=======
42-
)
43-
>>>>>>> 8596d46 (WIP: Refactor backend to a rest api and make weak changes to the front to make it works)

0 commit comments

Comments
 (0)