Skip to content

W
widget_group 6
Commit fa38c876 authored by Patricia Isabella Nava's avatar Patricia Isabella Nava
Browse files
Options

fix: compile error due to unresolved merge conflict

parent b293ab0f
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
widget_group_6/widget_group_6/urls.py
View file @ fa38c876
...@@ -18,10 +18,7 @@ from django.urls import include, path ...@@ -18,10 +18,7 @@ from django.urls import include, path
urlpatterns = [ urlpatterns = [
path('assignments/', include('assignments.urls', namespace="assignments")), path('assignments/', include('assignments.urls', namespace="assignments")),
<<<<<<< HEAD
path("forum/", include('forum.urls', namespace="forum")), path("forum/", include('forum.urls', namespace="forum")),
=======
path("homepage/", include('homepage.urls', namespace="homepage")), path("homepage/", include('homepage.urls', namespace="homepage")),
>>>>>>> e300a8c046c8972af41b6f32c723221b6d6ad0fa
path('admin/', admin.site.urls), path('admin/', admin.site.urls),
] ]
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