summaryrefslogtreecommitdiff
path: root/scipy2012/urls.py
diff options
context:
space:
mode:
Diffstat (limited to 'scipy2012/urls.py')
-rwxr-xr-xscipy2012/urls.py7
1 files changed, 1 insertions, 6 deletions
diff --git a/scipy2012/urls.py b/scipy2012/urls.py
index 8ec55eb..58134e6 100755
--- a/scipy2012/urls.py
+++ b/scipy2012/urls.py
@@ -14,11 +14,6 @@ urlpatterns = patterns('',
# url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
# Uncomment the next line to enable the admin:
+ url(r'^2012/', include('conference.urls', namespace='conference')),
url(r'^admin/', include(admin.site.urls)),
- url(r'^$', home),
- url(r'^keynote/', keynote),
- url(r'^tutorials/', tutorials),
- url(r'^talks/', talks),
- url(r'^sponsors/', sponsors),
- url(r'^details/(\d+)/$', details),
)