修复冲突

contest_submission/views.py

@@ -126,6 +126,7 @@ def contest_problem_submissions_list_page(request, contest_id, page=1):
                       {"submissions": current_page, "page": int(page),
                        "previous_page": previous_page, "next_page": next_page, "start_id": int(page) * 20 - 20,
                        "contest": contest})
+
     return render(request, "oj/contest/submissions_list.html",
                   {"submissions": current_page, "page": int(page),
                    "previous_page": previous_page, "next_page": next_page, "start_id": int(page) * 20 - 20,