修复冲突

2015-09-08 19:00:35 +08:00
parent 254427ef7c a3cbe157bb
commit d987aba71e
9 changed files with 57 additions and 18 deletions
--- a/template/src/oj/contest/submissions_list.html
+++ b/template/src/oj/contest/submissions_list.html
@@ -65,7 +65,10 @@
                </thead>
                {% if submissions %}
                <tbody>
+<<<<<<< HEAD

+=======
+>>>>>>> dev
                {% for item in submissions %}
                    <tr>
                        {% ifequal item.user_id request.user.id %}