Cavemanon/cavemanon-wagtail-personalisation
Archived
7
Fork 0
Code Issues Pull Requests Activity

Fixed merge conflict

Browse Source
This commit is contained in:
Jasper Berghoef
2016-11-08 15:00:15 +01:00
parent b1c39fd8ad
commit 26079e1e92
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/personalisation/wagtail_hooks.py
View File

@ -1,18 +1,8 @@
from django.conf import settings from django.conf import settings
from django.conf.urls import include, url from django.conf.urls import include, url
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
<<<<<<< HEAD
from wagtail.wagtailadmin import widgets
from wagtail.wagtailadmin.menu import MenuItem
from wagtail.wagtailadmin.modal_workflow import render_modal_workflow
from personalisation import admin_urls
=======
>>>>>>> master
from wagtail.contrib.modeladmin.helpers import ButtonHelper
from wagtail.contrib.modeladmin.options import ModelAdmin, modeladmin_register from wagtail.contrib.modeladmin.options import ModelAdmin, modeladmin_register
from wagtail.wagtailadmin import widgets
from wagtail.wagtailadmin.menu import MenuItem
from wagtail.wagtailcore import hooks from wagtail.wagtailcore import hooks
from personalisation import admin_urls from personalisation import admin_urls