From: gfawcett <gfawcett@6d9bc8c9-1ec2-4278-b937-99fde70a366f>
Date: Wed, 13 Apr 2011 23:44:31 +0000 (+0000)
Subject: conifer/urls.py: reverting URL change; this was clobbering the Django admin screen.
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=2fb55761fe147afc68ef579e735dbfbe7ba3d975;p=syrup%2Fmasslnc.git

conifer/urls.py: reverting URL change; this was clobbering the Django admin screen.

git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@1352 6d9bc8c9-1ec2-4278-b937-99fde70a366f
---

diff --git a/conifer/urls.py b/conifer/urls.py
index c445eae..833e8ec 100644
--- a/conifer/urls.py
+++ b/conifer/urls.py
@@ -21,7 +21,7 @@ urlpatterns = patterns('',
     (r'^djadmin/doc/', include('django.contrib.admindocs.urls')),
 
     # Uncomment the next line to enable the admin:
-    url(r'^admin/', include(admin.site.urls)),
+    url(r'^djadmin/', include(admin.site.urls)),
     # old form: (r'^djadmin/(.*)', admin.site.root),
     (r'^djmedia/(.*)', 'django.views.static.serve',
         {'document_root': ADMIN_MEDIA_ROOT}),