[c] remove merge conflict überbleibsel

2024-10-29 18:53:46 +01:00 · 2024-10-29 18:53:46 +01:00 · 75fe71de78
commit 75fe71de78
parent cda90ee02a
1 changed files with 0 additions and 5 deletions
--- a/src/lib/components/Projects.svelte
+++ b/src/lib/components/Projects.svelte
@ -1,11 +1,6 @@
 <script lang="ts">
 	import { smoothScrollTo, handleKeydown } from '$lib/index';

-<<<<<<< HEAD
-=======
-	import { smoothScrollTo, handleKeydown } from '$lib/index';
-
->>>>>>> 18dbba03a6b12b96e49fa2035d696de633ac3e6f
 	// Modal
 	import Modal from '$lib/components/Modal.svelte';
 	import DashinitModal from '$lib/modals/dashinit.svelte';