squash!

PlayForm · Oct 23, 2023 · cf3fd04 · cf3fd04
1 parent c97ab5f
commit cf3fd04
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/Source/Layout/Base.astro b/Source/Layout/Base.astro
@@ -79,7 +79,6 @@ import { ViewTransitions } from "astro:transitions";
 		<slot name="scripts" />
 
 		<!-- Favicon -->
-<<<<<<< HEAD
 		<link
 			rel="apple-touch-icon"
 			sizes="114x114"
@@ -160,8 +159,6 @@ import { ViewTransitions } from "astro:transitions";
 			content="/Favicon/mstile-144x144.png"
 		/>
 
-=======
->>>>>>> upstream/main
 		<ViewTransitions />
 	</Head>
 	<body class="flex grow flex-col">