mirror of
https://github.com/bookwyrm-social/bookwyrm.git
synced 2024-12-22 16:16:39 +00:00
resolve conflict
This commit is contained in:
parent
02c6932409
commit
48bcb85e24
1 changed files with 1 additions and 1 deletions
|
@ -13,7 +13,7 @@
|
|||
{% if partner %}<p class="subtitle"><a href="{% url 'direct-messages' %}"><span class="icon icon-arrow-left" aria-hidden="true"></span> {% trans "All messages" %}</a></p>{% endif %}
|
||||
</header>
|
||||
|
||||
<div class="box" id="tour-dm-box">
|
||||
<div class="box">
|
||||
{% include 'snippets/create_status/status.html' with type="direct" uuid=1 mention=partner %}
|
||||
</div>
|
||||
|
||||
|
|
Loading…
Reference in a new issue