mirror of
https://github.com/mat-1/matdoesdev.git
synced 2025-08-02 06:36:04 +00:00
fix conflicts
This commit is contained in:
parent
f10bbaca40
commit
5a56cb1e0d
4 changed files with 3 additions and 4 deletions
1
.gitattributes
vendored
Normal file
1
.gitattributes
vendored
Normal file
|
@ -0,0 +1 @@
|
||||||
|
* text=auto eol=lf
|
|
@ -1,6 +1,5 @@
|
||||||
<script lang="ts" context="module">
|
<script lang="ts" context="module">
|
||||||
export const prerender = true
|
export const prerender = true
|
||||||
export const hydrate = false
|
|
||||||
// export const router = false
|
// export const router = false
|
||||||
|
|
||||||
import type { Load } from '@sveltejs/kit'
|
import type { Load } from '@sveltejs/kit'
|
||||||
|
|
|
@ -3,7 +3,6 @@
|
||||||
import type { Load } from '@sveltejs/kit'
|
import type { Load } from '@sveltejs/kit'
|
||||||
|
|
||||||
export const prerender = true
|
export const prerender = true
|
||||||
export const hydrate = false
|
|
||||||
// export const router = false
|
// export const router = false
|
||||||
|
|
||||||
export const load: Load = async ({ page, fetch }) => {
|
export const load: Load = async ({ page, fetch }) => {
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
<script context="module" lang="ts">
|
<script context="module" lang="ts">
|
||||||
export const prerender = true
|
export const prerender = true
|
||||||
export const hydrate = false
|
export const router = false
|
||||||
// export const router = false
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
|
@ -9,6 +8,7 @@
|
||||||
import { onMount } from 'svelte'
|
import { onMount } from 'svelte'
|
||||||
|
|
||||||
let titleEl: HTMLParagraphElement
|
let titleEl: HTMLParagraphElement
|
||||||
|
|
||||||
onMount(async () => {
|
onMount(async () => {
|
||||||
const titleContent = titleEl.textContent ?? ''
|
const titleContent = titleEl.textContent ?? ''
|
||||||
titleEl.textContent = ''
|
titleEl.textContent = ''
|
||||||
|
|
Loading…
Add table
Reference in a new issue