conflict fix

2023-06-07 09:48:42 +09:00
parent 833310ba83 e913a641fa
commit 37fb6c3071
6 changed files with 36 additions and 6 deletions
--- a/src/lib/Setting/Pages/DisplaySettings.svelte
+++ b/src/lib/Setting/Pages/DisplaySettings.svelte
@@ -145,5 +145,9 @@
        }}/>
        <span>{language.textScreenBorder}</span>
    </div>
+{/if}

-{/if}
+<div class="flex items-center mt-2">
+    <Check bind:check={$DataBase.useChatCopy}/>
+    <span>{language.useChatCopy}</span>
+</div>