Removed unnecessary text in files

widget_vincentdjango/widget_vincentdjango/settings.py

@@ -41,13 +41,10 @@ INSTALLED_APPS = [
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'dashboard',
-<<<<<<< HEAD
-    'widget_calendar',
-=======
     'assignments',
     'announcementBoard',
     'forum',
->>>>>>> 9c69f26864be05db435049d9b3356488faefbbbc
+    'widget_calendar',
 ]
 
 MIDDLEWARE = [

widget_vincentdjango/widget_vincentdjango/urls.py

@@ -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
 ]