Skip to content

W
widget_django unchained
Commit e2d5715c authored by Joshua Son's avatar Joshua Son
Browse files
Options

Replace urls.py

parent e9596b0b
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 9 deletions
widget_django_unchained/widget_django_unchained/urls.py
View file @ e2d5715c
...@@ -17,10 +17,6 @@ from django.contrib import admin ...@@ -17,10 +17,6 @@ from django.contrib import admin
from django.urls import include, path from django.urls import include, path
from django.conf import settings from django.conf import settings
from django.conf.urls.static import static from django.conf.urls.static import static
<<<<<<< HEAD
=======
>>>>>>> cfaf9ababe2607db22a5f225df2d8f007ea1dc50
urlpatterns = [ urlpatterns = [
path('announcements/', include('announcements.urls')), path('announcements/', include('announcements.urls')),
...@@ -28,8 +24,4 @@ urlpatterns = [ ...@@ -28,8 +24,4 @@ urlpatterns = [
path('forum/', include('forum.urls')), path('forum/', include('forum.urls')),
path('assignments/', include('assignments.urls')), path('assignments/', include('assignments.urls')),
path('admin/', admin.site.urls), path('admin/', admin.site.urls),
<<<<<<< HEAD ]+ static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) \ No newline at end of file
=======
]+ static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
>>>>>>> cfaf9ababe2607db22a5f225df2d8f007ea1dc50
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