From 245120e7ca8231be1b650fd01b3b1ac164aedeec Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Sat, 9 Jul 2022 20:08:23 +1000
Subject: [PATCH] resolve git conflict with main branch

---
 bookwyrm/templates/feed/direct_messages.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/feed/direct_messages.html b/bookwyrm/templates/feed/direct_messages.html
index 196d1a390..74af303e1 100644
--- a/bookwyrm/templates/feed/direct_messages.html
+++ b/bookwyrm/templates/feed/direct_messages.html
@@ -14,7 +14,7 @@
 </header>
 
 <div class="box" id="tour-dm-box">
-    {% include 'snippets/create_status/status.html' with type="direct" uuid=1 mention=partner no_script=True %}
+    {% include 'snippets/create_status/status.html' with type="direct" uuid=1 mention=partner %}
 </div>
 
 <section class="block">