diff options
| author | nishanth | 2010-02-04 23:16:46 +0530 |
|---|---|---|
| committer | nishanth | 2010-02-04 23:16:46 +0530 |
| commit | b73b0118d99799c7f0abd553f82fac8a65f7f214 (patch) | |
| tree | 82da77ed222f7ee834738c1bea63c3ff0e7bad89 /urls.py | |
| parent | 9f940aa6a9e67241d1c680b35b8f280f7210c514 (diff) | |
| download | pytask-b73b0118d99799c7f0abd553f82fac8a65f7f214.tar.gz pytask-b73b0118d99799c7f0abd553f82fac8a65f7f214.tar.bz2 pytask-b73b0118d99799c7f0abd553f82fac8a65f7f214.zip | |
resolved merging conflicts in urls.py .
Diffstat (limited to 'urls.py')
| -rw-r--r-- | urls.py | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -4,7 +4,7 @@ from django.conf.urls.defaults import * from django.contrib import admin admin.autodiscover() -from pytask.taskapp.views.user import homepage, register, user_login, user_logout +from pytask.taskapp.views.user import homepage, register, user_login, user_logout, view_my_profile, edit_my_profile from pytask.taskapp.views.task import browse_tasks, view_task, create_task, add_mentor, add_tasks, claim_task, assign_task urlpatterns = patterns('', @@ -32,6 +32,6 @@ urlpatterns = patterns('', (r'^accounts/logout/$',user_logout), (r'^user/view/uid=(\d+)$', view_my_profile), - (r'^user/edit/?$',edit_my_profile), + (r'^user/edit/?$', edit_my_profile), ) |