Removed unnecessary text in files

parent 2b315eeb
......@@ -41,13 +41,10 @@ INSTALLED_APPS = [
'django.contrib.messages',
'django.contrib.staticfiles',
'dashboard',
<<<<<<< HEAD
'widget_calendar',
=======
'assignments',
'announcementBoard',
'forum',
>>>>>>> 9c69f26864be05db435049d9b3356488faefbbbc
'widget_calendar',
]
MIDDLEWARE = [
......
......@@ -19,11 +19,8 @@ from django.urls import include, path
urlpatterns = [
path('admin/', admin.site.urls),
path('dashboard/', include('dashboard.urls', namespace="dashboard")),
<<<<<<< HEAD
path('widget_calendar/', include('widget_calendar.urls', namespace="widget_calendar")),
=======
path('assignments/', include('assignments.urls', namespace="assignments")),
path('announcementBoard/', include('announcementBoard.urls', namespace="announcementBoard")),
path('forum/', include('forum.urls', namespace="forum")),
>>>>>>> 9c69f26864be05db435049d9b3356488faefbbbc
]
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