Commit 911bcc76 authored by Ann Colleen Garcia's avatar Ann Colleen Garcia

Fixed a minor bug in settings.py

parent 2987adb1
...@@ -42,10 +42,7 @@ INSTALLED_APPS = [ ...@@ -42,10 +42,7 @@ INSTALLED_APPS = [
'django.contrib.staticfiles', 'django.contrib.staticfiles',
'Dashboard', 'Dashboard',
'widgetcalendar', 'widgetcalendar',
<<<<<<< HEAD
'Announcement_Board', 'Announcement_Board',
=======
>>>>>>> e14dae0907d0378dbc2928dcf9c1ec6f847e7e43
] ]
MIDDLEWARE = [ MIDDLEWARE = [
......
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