Initialized merge tracking via "svnmerge" with revisions "1-105" from

[osqa.git] / urls.py

diff --git a/urls.py b/urls.py
index 3ebc19e8073bbb10d384d52935213d96de9082f0..e929254c1538076eed5689ad9f48ba170e458ee9 100644 (file)
--- a/urls.py
+++ b/urls.py
@@ -2,10 +2,7 @@ from django.conf.urls.defaults import *
 from django.utils.translation import ugettext as _
 from django.conf import settings
 
 from django.utils.translation import ugettext as _
 from django.conf import settings
 

-from django.contrib import admin
-admin.autodiscover()
-

 urlpatterns = patterns('',
     (r'^%s' % settings.FORUM_SCRIPT_ALIAS, include('forum.urls')),
 urlpatterns = patterns('',
     (r'^%s' % settings.FORUM_SCRIPT_ALIAS, include('forum.urls')),

-    (r'^admin/', include(admin.site.urls)),

 )
 )

+