Rebasing onto Physionet dev

MIT-LCP · Sep 13, 2023 · 9d9ae13 · 9d9ae13
1 parent 92f24db
commit 9d9ae13
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/physionet-django/user/views.py b/physionet-django/user/views.py
@@ -816,15 +816,8 @@ def edit_certification(request):
 
     return render(
         request,
-<<<<<<< HEAD
         "user/edit_certification.html",
         {"training_by_status": training_by_status},
-=======
-        'user/edit_training.html',
-        {'training_form': training_form,
-         'training_by_status': training_by_status,
-         'ticket_system_url': ticket_system_url},
->>>>>>> 40c25082 (removing accidental changes)
     )