From 2aabc2dc45c16c8d095c099b46a8e80dfd0e6a41 Mon Sep 17 00:00:00 2001
From: benjaoming <benjaoming@gmail.com>
Date: Sun, 3 Feb 2013 14:27:27 +0100
Subject: [PATCH] move macros configuration and do not include django_notify
 twice in the urlconf

---
 testproject/testproject/settings.py | 4 ++--
 testproject/testproject/urls.py     | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/testproject/testproject/settings.py b/testproject/testproject/settings.py
index 75514505..a404d50f 100644
--- a/testproject/testproject/settings.py
+++ b/testproject/testproject/settings.py
@@ -101,15 +101,15 @@ INSTALLED_APPS = (
     'django.contrib.admindocs',
     'south',
     'sekizai',
-    'django_notify',
     'sorl.thumbnail',
+    'django_notify',
     'wiki',
+    'wiki.plugins.macros',
     'wiki.plugins.help',
     'wiki.plugins.links',
     'wiki.plugins.images',
     'wiki.plugins.attachments',
     'wiki.plugins.notifications',
-    'wiki.plugins.macros',
     'mptt',
     #'haystack',
 )
diff --git a/testproject/testproject/urls.py b/testproject/testproject/urls.py
index 2bae8b86..947ab6c7 100644
--- a/testproject/testproject/urls.py
+++ b/testproject/testproject/urls.py
@@ -8,7 +8,6 @@ admin.autodiscover()
 urlpatterns = patterns('',
     url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
     url(r'^admin/', include(admin.site.urls)),
-    url(r'^notify/', include('django_notify.urls', namespace='notify')),
 )
 
 if settings.DEBUG:
-- 
2.45.2