-=======
-
->>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef
->>>>>>> 83a725da3916d4176d50fd4e4ea7cfd56d42e9e1
\ No newline at end of file
Welcome to my personal webpage
My name is Christian and I live in Copenhagen. In my professional life, I recruit in product and engineering.
diff --git a/src/routes/about/+page.svelte b/src/routes/about/+page.svelte index e174731..62fb691 100644 --- a/src/routes/about/+page.svelte +++ b/src/routes/about/+page.svelte @@ -1,8 +1,2 @@ -<<<<<<< HEADLife is good in Copenhagen
-I live in Copenhagen with my partner and children.
-======= -This is the about page
-My name is Christian, and I live in Denmark with my partner and kids.
->>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef -testing
\ No newline at end of file +I live in Copenhagen with my partner and children.
\ No newline at end of file diff --git a/src/routes/homelab/+page.svelte b/src/routes/homelab/+page.svelte index bf2e53f..59e86ab 100644 --- a/src/routes/homelab/+page.svelte +++ b/src/routes/homelab/+page.svelte @@ -1,4 +1,3 @@ -<<<<<<< HEADWhat should this look like?
@@ -10,7 +9,4 @@
Raports style
Mix of them all
-
-=======
-