mirror of
https://github.com/QingdaoU/OnlineJudge.git
synced 2024-09-21 16:33:22 +00:00
修复冲突,忘记去掉冲突标志了。。。
This commit is contained in:
parent
17f10f262b
commit
81f7b09d83
@ -65,10 +65,6 @@
|
|||||||
</thead>
|
</thead>
|
||||||
{% if submissions %}
|
{% if submissions %}
|
||||||
<tbody>
|
<tbody>
|
||||||
<<<<<<< HEAD
|
|
||||||
|
|
||||||
=======
|
|
||||||
>>>>>>> dev
|
|
||||||
{% for item in submissions %}
|
{% for item in submissions %}
|
||||||
<tr>
|
<tr>
|
||||||
{% ifequal item.user_id request.user.id %}
|
{% ifequal item.user_id request.user.id %}
|
||||||
|
Loading…
Reference in New Issue
Block a user