[c] remove merge conflict überbleibsel
This commit is contained in:
parent
cda90ee02a
commit
75fe71de78
1 changed files with 0 additions and 5 deletions
|
@ -1,11 +1,6 @@
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { smoothScrollTo, handleKeydown } from '$lib/index';
|
import { smoothScrollTo, handleKeydown } from '$lib/index';
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
import { smoothScrollTo, handleKeydown } from '$lib/index';
|
|
||||||
|
|
||||||
>>>>>>> 18dbba03a6b12b96e49fa2035d696de633ac3e6f
|
|
||||||
// Modal
|
// Modal
|
||||||
import Modal from '$lib/components/Modal.svelte';
|
import Modal from '$lib/components/Modal.svelte';
|
||||||
import DashinitModal from '$lib/modals/dashinit.svelte';
|
import DashinitModal from '$lib/modals/dashinit.svelte';
|
||||||
|
|
Loading…
Reference in a new issue