diff options
| author | prathamesh | 2016-08-31 01:37:20 +0530 |
|---|---|---|
| committer | prathamesh | 2016-08-31 01:37:20 +0530 |
| commit | 24593514378e86cd2f0ef62e11e8a4c9dee0f5ad (patch) | |
| tree | 686d263a31445a19d6addd4fca13e9bb1041755d /yaksh/urls.py | |
| parent | 11dec9deba7120f85d3d2b47cfd31fca8587bbbc (diff) | |
| parent | aefc8eed3b0c18520059b4005978f1db9cf5591b (diff) | |
| download | online_test-24593514378e86cd2f0ef62e11e8a4c9dee0f5ad.tar.gz online_test-24593514378e86cd2f0ef62e11e8a4c9dee0f5ad.tar.bz2 online_test-24593514378e86cd2f0ef62e11e8a4c9dee0f5ad.zip | |
Merge branch 'master' of https://github.com/FOSSEE/online_test into view_answerpaper
Resolved
Conflicts:
yaksh/views.py
Diffstat (limited to 'yaksh/urls.py')
| -rw-r--r-- | yaksh/urls.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/yaksh/urls.py b/yaksh/urls.py index 931e69c..69d7f87 100644 --- a/yaksh/urls.py +++ b/yaksh/urls.py @@ -98,7 +98,6 @@ urlpatterns += [ views.reject, {'was_enrolled': True}), url(r'^manage/searchteacher/(?P<course_id>\d+)/$', views.search_teacher), url(r'^manage/addteacher/(?P<course_id>\d+)/$', views.add_teacher, name='add_teacher'), - url(r'^manage/allotted_course/$', views.allotted_courses), url(r'^manage/remove_teachers/(?P<course_id>\d+)/$', views.remove_teachers, name='remove_teacher'), url(r'^manage/download_questions/$', views.show_all_questions), url(r'^manage/upload_questions/$', views.show_all_questions), |