edited out some unnecessary lines from the code

widget_group22/widget_group22/settings.py

@@ -41,12 +41,9 @@ INSTALLED_APPS = [
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'homepage',
-<<<<<<< HEAD
     'announcements',
-=======
     'forum',
     'assignments',
->>>>>>> e7d88b79ac7d8be26bb5115ccf9a5361ce1e38bf
 ]
 
 MIDDLEWARE = [

widget_group22/widget_group22/urls.py

@@ -18,12 +18,9 @@ from django.urls import include, path
 
 urlpatterns = [
     path('admin/', admin.site.urls),
-<<<<<<< HEAD
     path('homepage/', include('homepage.urls', namespace="homepage")),
     path('announcements/', include('announcements.urls', namespace = "announcements")),
-=======
     path('forum/',include('forum.urls',namespace="forum")),
     path('homepage/', include('homepage.urls', namespace="homepage")),
     path('assignments/', include('assignments.urls', namespace="assignments")),
->>>>>>> e7d88b79ac7d8be26bb5115ccf9a5361ce1e38bf
 ]