resolved merging conflicts in urls.py .
--- a/urls.py Thu Feb 04 23:15:37 2010 +0530
+++ b/urls.py Thu Feb 04 23:16:46 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),
)