Merge branch 'gilbert' of git://github.com/lapilofu/philo into gilbert

[philo.git] / urls.py

diff --git a/urls.py b/urls.py
index 77ec968..47be7da 100644 (file)
--- a/urls.py
+++ b/urls.py
@@ -1,8 +1,8 @@
-from django.conf.urls.defaults import url, include, patterns, handler404, handler500
-from philo.views import page_view
+from django.conf.urls.defaults import patterns, url
+from philo.views import node_view

 
 
 urlpatterns = patterns('',
 
 
 urlpatterns = patterns('',

-       url(r'^$', page_view, name='philo-root'),
-       url(r'^(?P<path>.*)$', page_view, name='philo-page-by-path')
+       url(r'^$', node_view, name='philo-root'),
+       url(r'^(?P<path>.*)$', node_view, name='philo-node-by-path')

 )
 )