# HG changeset patch
# User nishanth
# Date 1265017600 -19800
# Node ID c5a282b84eb86aa25269dd88d20bde14ea21012d
# Parent  2cff66e3386a9258f74a56aa2e6da8dd7a913afb
resolved merging conflicts in urls.py

diff -r 2cff66e3386a -r c5a282b84eb8 pytask/urls.py
--- a/pytask/urls.py	Mon Feb 01 15:11:50 2010 +0530
+++ b/pytask/urls.py	Mon Feb 01 15:16:40 2010 +0530
@@ -4,7 +4,7 @@
 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 @@
     (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),
 
 )