diff options
| author | katkamrachana <katkam.rachana@gmail.com> | 2014-10-10 16:58:41 +0530 |
|---|---|---|
| committer | katkamrachana <katkam.rachana@gmail.com> | 2014-10-10 16:58:41 +0530 |
| commit | d2a29d7276cd0d69a688de0ddeb0ccf97c1df3c9 (patch) | |
| tree | 48db4d99bc0155496268b0c3799a5cf8bc6122ae /gnowsys-ndf/gnowsys_ndf/ndf/urls/user.py | |
| parent | 04e0741f1c2f65cb18a84a3c61258c2740fe416f (diff) | |
| parent | 3c0498b98b39f2e1d642d09a88ac775e5b569488 (diff) | |
| download | gnowsys-d2a29d7276cd0d69a688de0ddeb0ccf97c1df3c9.tar.gz | |
Conflicts resolved with commit #863
Diffstat (limited to 'gnowsys-ndf/gnowsys_ndf/ndf/urls/user.py')
| -rw-r--r-- | gnowsys-ndf/gnowsys_ndf/ndf/urls/user.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/user.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/user.py index 33043a2..7a79925 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/user.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/user.py @@ -4,7 +4,7 @@ urlpatterns = patterns('gnowsys_ndf.ndf.views.userDashboard', url(r'^userpreference/', 'userpref',name='userpreference'), url(r'^dashboard', 'uDashboard', name='dashboard'), # url(r'^(?P<usrid>[\w-]+)/userDashboard$', 'dashboard', name='userDashboard'), + url(r'^useractivity', 'user_activity', name='user_activity'), url(r'^user_preference/(?P<auth_id>[\w-]+)$','user_preferences',name='user_preferences'), - ) |