add import

clouditor · Jul 21, 2023 · 81e8fc3 · 81e8fc3
1 parent 854c08d
commit 81e8fc3
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/src/routes/public/certificates/+page.svelte b/src/routes/public/certificates/+page.svelte
@@ -1,9 +1,5 @@
 <script lang="ts">
-<<<<<<< HEAD
 	import { Col, Container, Row, Alert } from 'sveltestrap';
-=======
-	import { Col, Container, Row } from 'sveltestrap';
->>>>>>> main
 	import PublicCertificateCard from '$lib/PublicCertificateCard.svelte';
 	import type { PageData } from './$types';