fix: broken conflict merge

why does github's web conflict resolver not have highlighting
This commit is contained in:
Maya 2025-10-20 06:09:18 +03:00
parent 9ccf5440c2
commit e7ff0f23af
No known key found for this signature in database
1 changed files with 23 additions and 41 deletions

View File

@ -101,48 +101,29 @@
</h2> </h2>
{#if ghContribs && ghContribs.length > 0} {#if ghContribs && ghContribs.length > 0}
<p class="text-base text-muted font-normal"> <p class="text-base text-muted font-normal">
{@html link( {@html sanitize(
link(
"github_link", "github_link",
m["about.credits.github_description"](), m["about.credits.github_description"](),
GITHUB_URL_VERT, GITHUB_URL_VERT,
true true,
),
)} )}
</p> </p>
{:else} {:else}
<p class="text-base text-muted font-normal italic"> <p class="text-base text-muted font-normal italic">
{@html link( {@html sanitize(
link(
"contribute_link", "contribute_link",
m["about.credits.no_contributors"](), m["about.credits.no_contributors"](),
GITHUB_URL_VERT, GITHUB_URL_VERT,
true,
),
)} )}
</p> </p>
{/if} {/if}
</div> </div>
{#if ghContribs && ghContribs.length > 0}
<p class="text-base text-muted font-normal">
{@html sanitize(
link(
"github_link",
m["about.credits.github_description"](),
GITHUB_URL_VERT,
true,
),
)}
</p>
{:else}
<p class="text-base text-muted font-normal italic">
{@html sanitize(
link(
"contribute_link",
m["about.credits.no_contributors"](),
GITHUB_URL_VERT,
true,
),
)}
</p>
{/if}
</div>
{#if ghContribs && ghContribs.length > 0} {#if ghContribs && ghContribs.length > 0}
<div class="flex flex-row flex-wrap gap-2"> <div class="flex flex-row flex-wrap gap-2">
{#each ghContribs as contrib} {#each ghContribs as contrib}
@ -151,11 +132,12 @@
{/each} {/each}
</div> </div>
{/if} {/if}
</div>
<h2 class="mt-2 -mb-2">{m["about.credits.libraries"]()}</h2> <h2 class="mt-2 -mb-2">{m["about.credits.libraries"]()}</h2>
<p class="font-normal"> <p class="font-normal">
{m["about.credits.libraries_description"]()} {m["about.credits.libraries_description"]()}
</p> </p>
{/if}
</div> </div>
</div></Panel </Panel>
>