This commit is contained in:
christian 2024-04-21 17:11:29 +02:00
parent 3d43600353
commit e1546b04c3
4 changed files with 3 additions and 25 deletions

View File

@ -25,12 +25,8 @@
"tailwindcss": "^3.4.3", "tailwindcss": "^3.4.3",
"vite": "^5.0.3" "vite": "^5.0.3"
}, },
<<<<<<< HEAD
"type": "module", "type": "module",
"dependencies": { "dependencies": {
"@sveltejs/adapter-node": "^5.0.1" "@sveltejs/adapter-node": "^5.0.1"
} }
=======
"type": "module"
>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef
} }

View File

@ -1,12 +1,4 @@
<<<<<<< HEAD
<div class="main-container text-center"> <div class="main-container text-center">
=======
<<<<<<< HEAD
<div class="main-container text-center">
=======
<div class="main-container w-2/4 mx-auto text-center">
>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef
>>>>>>> 83a725da3916d4176d50fd4e4ea7cfd56d42e9e1
<h1 class="text-xl mb-2">Welcome to my personal webpage</h1> <h1 class="text-xl mb-2">Welcome to my personal webpage</h1>
<p class="text-left">My name is Christian and I live in Copenhagen. In my professional life, I recruit in product and engineering. <p class="text-left">My name is Christian and I live in Copenhagen. In my professional life, I recruit in product and engineering.
</p> </p>

View File

@ -1,8 +1,2 @@
<<<<<<< HEAD
<h1 class="text-xl font-jose">Life is good in Copenhagen</h1> <h1 class="text-xl font-jose">Life is good in Copenhagen</h1>
<h2>I live in Copenhagen with my partner and children.</h2> <h2>I live in Copenhagen with my partner and children.</h2>
=======
<h1>This is the about page</h1>
<h2>My name is Christian, and I live in Denmark with my partner and kids.</h2>
>>>>>>> 1ebbbc85a1b523f524bc10635b7227024eab0eef
<p>testing</p>

View File

@ -1,4 +1,3 @@
<<<<<<< HEAD
<h1>What should this look like?</h1> <h1>What should this look like?</h1>
<div class="content text-left px-8"> <div class="content text-left px-8">
@ -11,6 +10,3 @@
<li>Mix of them all</li> <li>Mix of them all</li>
</ol> </ol>
</div> </div>
=======
<h1 class="text-2xl font-jose">aaaawwww yea the pride of my life</h1>
>>>>>>> 83a725da3916d4176d50fd4e4ea7cfd56d42e9e1