From 81f7b09d838a01357dea9d6027203d8c45b0fe4e Mon Sep 17 00:00:00 2001
From: "sxw@401" <sxwxs@msn.com>
Date: Tue, 8 Sep 2015 21:01:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=86=B2=E7=AA=81=EF=BC=8C?=
 =?UTF-8?q?=E5=BF=98=E8=AE=B0=E5=8E=BB=E6=8E=89=E5=86=B2=E7=AA=81=E6=A0=87?=
 =?UTF-8?q?=E5=BF=97=E4=BA=86=E3=80=82=E3=80=82=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/src/oj/contest/submissions_list.html | 4 ----
 1 file changed, 4 deletions(-)

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 @@
                 </thead>
                 {% if submissions %}
                 <tbody>
-<<<<<<< HEAD
-
-=======
->>>>>>> dev
                 {% for item in submissions %}
                     <tr>
                         {% ifequal item.user_id request.user.id %}