修复冲突

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 %}