diff options
author | Kedar Aitawdekar <kedar2a@gmail.com> | 2015-03-05 14:48:36 +0530 |
---|---|---|
committer | Kedar Aitawdekar <kedar2a@gmail.com> | 2015-03-05 14:48:36 +0530 |
commit | a7137327149386bdd78ac0358960a53cd484678f (patch) | |
tree | 882fe348ca400510eff2ec9ffee4d332b47f5ede /gnowsys-ndf/gnowsys_ndf/ndf/urls/page.py | |
parent | c98621f8135928fbd050b16e02782300a284d9a0 (diff) | |
parent | 24950a58b2c1bfe943076478d96c6766d84f436e (diff) | |
download | gnowsys-a7137327149386bdd78ac0358960a53cd484678f.tar.gz |
Conflict resolved after taking pull
Diffstat (limited to 'gnowsys-ndf/gnowsys_ndf/ndf/urls/page.py')
-rw-r--r-- | gnowsys-ndf/gnowsys_ndf/ndf/urls/page.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/page.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/page.py index 6b0847a9..0b7a5e40 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/page.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/page.py @@ -1,7 +1,7 @@ from django.conf.urls import patterns, url urlpatterns = patterns('gnowsys_ndf.ndf.views.page', - url(r'^$', 'page', name='page'), + url(r'^[/]$', 'page', name='page'), url(r'^/details/(?P<app_id>[\w-]+)$', 'page', name='page_details'), url(r'^/(?P<app_id>[\w-]+)$', 'page', name='page_details'), url(r'^/create/', 'create_edit_page', name='page_create_edit'), |