Replace urls.py

widget_django_unchained/widget_django_unchained/urls.py

@@ -17,10 +17,6 @@ from django.contrib import admin
 from django.urls import include, path
 from django.conf import settings
 from django.conf.urls.static import static
-<<<<<<< HEAD
-
-=======
->>>>>>> cfaf9ababe2607db22a5f225df2d8f007ea1dc50
 
 urlpatterns = [
     path('announcements/', include('announcements.urls')),
@@ -28,8 +24,4 @@ urlpatterns = [
     path('forum/', include('forum.urls')),
     path('assignments/', include('assignments.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)
->>>>>>> cfaf9ababe2607db22a5f225df2d8f007ea1dc50
+]+ static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
\ No newline at end of file