From 5a56cb1e0db3bdc775bf809e7e3298d948c84336 Mon Sep 17 00:00:00 2001
From: mat <github@matdoes.dev>
Date: Thu, 18 Nov 2021 21:13:05 -0600
Subject: [PATCH] fix conflicts

---
 .gitattributes                     | 1 +
 src/routes/blog/index.svelte       | 1 -
 src/routes/blog/post/[slug].svelte | 1 -
 src/routes/index.svelte            | 4 ++--
 4 files changed, 3 insertions(+), 4 deletions(-)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..94f480d
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+* text=auto eol=lf
\ No newline at end of file
diff --git a/src/routes/blog/index.svelte b/src/routes/blog/index.svelte
index 743d148..7c20c49 100644
--- a/src/routes/blog/index.svelte
+++ b/src/routes/blog/index.svelte
@@ -1,6 +1,5 @@
 <script lang="ts" context="module">
 	export const prerender = true
-	export const hydrate = false
 	// export const router = false
 
 	import type { Load } from '@sveltejs/kit'
diff --git a/src/routes/blog/post/[slug].svelte b/src/routes/blog/post/[slug].svelte
index ea4d4a8..5170209 100644
--- a/src/routes/blog/post/[slug].svelte
+++ b/src/routes/blog/post/[slug].svelte
@@ -3,7 +3,6 @@
 	import type { Load } from '@sveltejs/kit'
 
 	export const prerender = true
-	export const hydrate = false
 	// export const router = false
 
 	export const load: Load = async ({ page, fetch }) => {
diff --git a/src/routes/index.svelte b/src/routes/index.svelte
index 0baf30d..84d539e 100644
--- a/src/routes/index.svelte
+++ b/src/routes/index.svelte
@@ -1,7 +1,6 @@
 <script context="module" lang="ts">
 	export const prerender = true
-	export const hydrate = false
-	// export const router = false
+	export const router = false
 </script>
 
 <script lang="ts">
@@ -9,6 +8,7 @@
 	import { onMount } from 'svelte'
 
 	let titleEl: HTMLParagraphElement
+
 	onMount(async () => {
 		const titleContent = titleEl.textContent ?? ''
 		titleEl.textContent = ''