diff options
| author | ankitjavalkar | 2018-03-06 12:01:59 +0530 |
|---|---|---|
| committer | ankitjavalkar | 2018-03-06 12:01:59 +0530 |
| commit | 9d689c2478d4f7f6f95f1e647dced17dd93e299c (patch) | |
| tree | fdf2b671be2dabcbaa95f91ef822852ab33e2750 /yaksh/urls.py | |
| parent | 7a892b8c664a69bd054efc6c662281e839546b7d (diff) | |
| download | online_test-9d689c2478d4f7f6f95f1e647dced17dd93e299c.tar.gz online_test-9d689c2478d4f7f6f95f1e647dced17dd93e299c.tar.bz2 online_test-9d689c2478d4f7f6f95f1e647dced17dd93e299c.zip | |
Remove conflict related residual comment
Diffstat (limited to 'yaksh/urls.py')
| -rw-r--r-- | yaksh/urls.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/yaksh/urls.py b/yaksh/urls.py index b4da1c0..f5f8895 100644 --- a/yaksh/urls.py +++ b/yaksh/urls.py @@ -140,8 +140,6 @@ urlpatterns = [ views.download_assignment_file, name="download_quiz_assignment"), url(r'^manage/courses/download_yaml_template/', views.download_yaml_template, name="download_yaml_template"), -<<<<<<< HEAD -<<<<<<< HEAD url(r'^manage/download_sample_csv/', views.download_sample_csv, name="download_sample_csv"), url(r'^manage/courses/edit_lesson/$', @@ -174,8 +172,6 @@ urlpatterns = [ views.design_course, name="design_course"), url(r'^manage/course_status/(?P<course_id>\d+)/$', views.course_status, name="course_status"), - url(r'^manage/download_questionpaper/(?P<questionpaper_id>\d+)/$', - views.download_questionpaper, name="download_questionpaper"), url(r'^manage/preview_questionpaper/(?P<questionpaper_id>\d+)/$', views.preview_questionpaper, name="preview_questionpaper"), ] |