formatting

Ecdar · Dec 13, 2023 · d87352c · d87352c
1 parent 849f541
commit d87352c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 18 deletions.
diff --git a/src/lib/components/toolBar/ToolBar.svelte b/src/lib/components/toolBar/ToolBar.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import ToolbarItem from "./ToolbarItem.svelte";
+	import ToolbarItem from "./ToolBarItem.svelte";
 	import {
 		Content_cut,
 		Arrow_downward,
@@ -33,17 +33,10 @@
 		</div>
 		<button class="collapsible unselectable">
 			<SvgButton
-<<<<<<< Updated upstream
-			icon={collapsed ? Arrow_downward : Arrow_right}
-			click={collapseOrExpand}
-			id="toolbar-collapse-expand"
-			color="white"
-=======
 				icon={collapsed ? Arrow_downward : Arrow_right}
 				click={collapseOrExpand}
 				id="toolbar-collapse-expand"
 				color="white"
->>>>>>> Stashed changes
 			/>
 		</button>
 	</div>
@@ -161,9 +154,4 @@
 		border: none;
 		display: flex;
 	}
-<<<<<<< Updated upstream
-
-	
-=======
->>>>>>> Stashed changes
 </style>
diff --git a/yarn.lock b/yarn.lock
@@ -497,11 +497,6 @@
   resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.27.8.tgz#6667fac16c436b5434a387a34dedb013198f6e6e"
   integrity sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==
 
-"@svelte-plugins/tooltips@^0.1.9":
-  version "0.1.9"
-  resolved "https://registry.yarnpkg.com/@svelte-plugins/tooltips/-/tooltips-0.1.9.tgz#b62814ee4b2ac98174622a6cb064937c1ef4fcec"
-  integrity sha512-Ut3LVy0OHJD2TAXNWSGYTNgF5ZB/MQ6g4WpZnps6cyGQsSZaTr8EiZJu9zcan9qybNLYoykGUxeU3Z7nGH7GMg==
-
 "@sveltejs/adapter-static@^2.0.3":
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/@sveltejs/adapter-static/-/adapter-static-2.0.3.tgz#616836c30bdce4d673a2e26c0f5ffbd5c1bc7c67"