diff --git a/.prettierignore b/.prettierignore index 36dcaeb08f..45e12c6e3f 100644 --- a/.prettierignore +++ b/.prettierignore @@ -37,3 +37,7 @@ sites/svelte.dev/src/lib/generated .changeset pnpm-lock.yaml pnpm-workspace.yaml + +# Temporarily ignore this file to avoid merge conflicts. +# see: https://github.com/sveltejs/svelte/pull/9609 +documentation/docs/05-misc/03-typescript.md diff --git a/documentation/docs/05-misc/03-typescript.md b/documentation/docs/05-misc/03-typescript.md index b4cc917cfb..3fe3580f7e 100644 --- a/documentation/docs/05-misc/03-typescript.md +++ b/documentation/docs/05-misc/03-typescript.md @@ -177,11 +177,9 @@ You cannot use TypeScript in your template's markup. For example, the following let count = 10; - -

Count as string: {count as string}!

+

Count as string: {count as string}!

{#if count > 4} - - {@const countString: string = count} + {@const countString: string = count} {countString} {/if} ```