edited urls.py and settings.py of widget_princessgabi project

widget_princessgabi/widget_princessgabi/settings.py

@@ -35,11 +35,11 @@ ALLOWED_HOSTS = []
 # Application definition
 
 INSTALLED_APPS = [
-<<<<<<< HEAD
-    'dashboard',
-=======
     'widget_calendar.apps.WidgetCalendarConfig',
->>>>>>> widget_calendar
+    'assignments.apps.AssignmentsConfig',
+    'forum.apps.ForumConfig',
+    'announcementboard.apps.AnnouncementboardConfig',
+    'dashboard.apps.DashboardConfig',
     'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',

widget_princessgabi/widget_princessgabi/urls.py

@@ -17,11 +17,10 @@ from django.contrib import admin
 from django.urls import include, path
 
 urlpatterns = [
-<<<<<<< HEAD
+    path('calendar/', include('widget_calendar.urls')),
+    path('assignments/', include('assignments.urls')),
     path('forum/', include("forum.urls", namespace = "forum")),
+    path('announcements/', include('announcementboard.urls')),
     path('dashboard/', include('dashboard.urls', namespace = "dashboard")),
-=======
-    path('calendar/', include('widget_calendar.urls')),
->>>>>>> widget_calendar
     path('admin/', admin.site.urls),
 ]