fix ArticleNav.svelte

8 months ago · 5d1f6231de
1 changed files with 0 additions and 1 deletions
--- a/src/lib/components/util/ArticleNav.svelte
+++ b/src/lib/components/util/ArticleNav.svelte
@ -162,7 +162,6 @@
				@@ -162,7 +162,6 @@
        {/if}
      {/if}
    </div>
-<<<<<<< HEAD
    <div class="flex flex-col flex-grow text justify-center items-center">
      <p class="max-w-[60vw] line-ellipsis">
        <b class="text-nowrap">{title}</b>