added merge migration

apps/establishment/migrations/0088_merge_20200130_1318.py

@@ -0,0 +1,14 @@
+# Generated by Django 2.2.7 on 2020-01-30 13:18
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('establishment', '0087_western_field'),
+        ('establishment', '0087_auto_20200130_1312'),
+    ]
+
+    operations = [
+    ]

project/settings/local.py

@@ -1,6 +1,8 @@
 """Local settings."""
-from .base import *
 import sys
+
+from .base import *
+
 # from .amazon_s3 import *
 
 ALLOWED_HOSTS = ['*', ]
@@ -84,11 +86,11 @@ LOGGING = {
         'py.warnings': {
             'handlers': ['console'],
         },
-        # 'django.db.backends': {
+        'django.db.backends': {
-        #     'handlers': ['console', ],
+            'handlers': ['console', ],
-        #     'level': 'DEBUG',
+            'level': 'DEBUG',
-        #     'propagate': False,
+            'propagate': False,
-        # },
+        },
     }
 }