Skip to content

Commit

Permalink
Resolve residual merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
yinanazhou committed Oct 5, 2023
1 parent c36b815 commit 25b1e2c
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion web-app/django/VIM/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
from VIM.apps.instruments.views.instrument_list import InstrumentList

urlpatterns = [
path("", home, name="home"),
path("admin/", admin.site.urls),
path("", include("VIM.apps.main.urls", namespace="main")),
path("instruments/", InstrumentList.as_view(), name="instrument-list"),
Expand Down

0 comments on commit 25b1e2c

Please sign in to comment.