diff --git a/template/src/oj/contest/submissions_list.html b/template/src/oj/contest/submissions_list.html index 0ae3031a..1424bb10 100644 --- a/template/src/oj/contest/submissions_list.html +++ b/template/src/oj/contest/submissions_list.html @@ -65,10 +65,6 @@ {% if submissions %}
-<<<<<<< HEAD - -======= ->>>>>>> dev {% for item in submissions %}