修复冲突，忘记去掉冲突标志了。。。

2015-09-08 21:01:37 +08:00
parent 17f10f262b
commit 81f7b09d83
1 changed files with 0 additions and 4 deletions
--- a/template/src/oj/contest/submissions_list.html
+++ b/template/src/oj/contest/submissions_list.html
@@ -65,10 +65,6 @@
                </thead>
                {% if submissions %}
                <tbody>
-<<<<<<< HEAD
-
-=======
->>>>>>> dev
                {% for item in submissions %}
                    <tr>
                        {% ifequal item.user_id request.user.id %}