fix conflict issue

2016-05-26 01:56:09 +02:00
parent a989e53da4
commit 7402fc49b6
7 changed files with 32 additions and 27 deletions
--- a/cms/views.py
+++ b/cms/views.py
@ -32,7 +32,6 @@ class PostBaseView:
                    for k in self.website.menu_layouts
                }.items() if v
            }
-
        context['view'] = self
        return context