Skip to content

W
widget_group17
Commit 3af982f3 authored by Vaughn Fajardo's avatar Vaughn Fajardo
Browse files
Options

chore: resolved merge commit error

parent 78681176
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
widget_group_17/widget_group_17/settings.py
View file @ 3af982f3
...@@ -35,11 +35,8 @@ ALLOWED_HOSTS = [] ...@@ -35,11 +35,8 @@ ALLOWED_HOSTS = []
# Application definition # Application definition
INSTALLED_APPS = [ INSTALLED_APPS = [
<<<<<<< HEAD
'forum.apps.ForumConfig', 'forum.apps.ForumConfig',
=======
'homepage.apps.HomepageConfig', 'homepage.apps.HomepageConfig',
>>>>>>> 9ac5c77fcb761514f0f3910c70225dd0540640bd
'django.contrib.admin', 'django.contrib.admin',
'django.contrib.auth', 'django.contrib.auth',
'django.contrib.contenttypes', 'django.contrib.contenttypes',
......
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