merge

selfsigned · Jan 25, 2024 · 24a972e · 24a972e
1 parent 07599f6
commit 24a972e
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/src/lib/3dmap/scene.svelte b/src/lib/3dmap/scene.svelte
@@ -1,9 +1,5 @@
 <script>
-<<<<<<< HEAD
 	import { GLTF, interactivity, Text } from '@threlte/extras';
-=======
-	import { GLTF, interactivity } from '@threlte/extras';
->>>>>>> b73777035a9199b8a683365c7c6ea9853f429e6f
 	import { T } from '@threlte/core';
 	import CameraControls from './cameracontrols.svelte';
 	import {
@@ -17,10 +13,7 @@
 	import ObjectModel from './objectmodel.svelte';
 	import { onMount } from 'svelte';
 	import { base } from '$app/paths';
-<<<<<<< HEAD
 	import labelsList from './labels.json';
-=======
->>>>>>> b73777035a9199b8a683365c7c6ea9853f429e6f
 
 	let objects = $objectsData;
 	let categories = $categoryData;