resolve merge conflict

2016-03-22 15:12:47 +00:00 · 2016-03-22 15:12:47 +00:00 · d57fc21784
commit d57fc21784
parent 3d34acc884 e99f23551b
9 changed files with 1348 additions and 132 deletions
--- a/dynamicweb/settings/base.py
+++ b/dynamicweb/settings/base.py
@ -86,7 +86,7 @@ INSTALLED_APPS = (
    'django_select2',
    'meta',
    'meta_mixin',
-    'admin_enhancer',
+#    'admin_enhancer',
    'djangocms_blog',
    'bootstrap3',
    'compressor',