fix

src/lib/components/chat/Messages.svelte

@@ -16,11 +16,7 @@
 
 	const i18n = getContext('i18n');
 
-<<<<<<< HEAD
-=======
 	export let className = 'h-full flex pt-8';
-
->>>>>>> c2b1693 (GitHub deploy: 1dfb479d367e5f5902f051c823f9aef836e04791)
 	export let chatId = '';
 	export let user = $_user;
 

src/routes/s/[id]/+page.svelte

@@ -8,15 +8,6 @@
 	import { settings, chatId, WEBUI_NAME, models } from '$lib/stores';
 	import { convertMessagesToHistory, createMessagesList } from '$lib/utils';
 
-<<<<<<< HEAD
-	import { getChatByShareId } from '$lib/apis/chats';
-
-	import Messages from '$lib/components/chat/Messages.svelte';
-	import Navbar from '$lib/components/layout/Navbar.svelte';
-	import { getUserById } from '$lib/apis/users';
-	import { error } from '@sveltejs/kit';
-	import { getModels } from '$lib/apis';
-=======
 	import { getChatByShareId, cloneSharedChatById } from '$lib/apis/chats';
 
 	import Messages from '$lib/components/chat/Messages.svelte';
@@ -25,7 +16,6 @@
 	import { getUserById } from '$lib/apis/users';
 	import { getModels } from '$lib/apis';
 	import { toast } from 'svelte-sonner';
->>>>>>> c2b1693 (GitHub deploy: 1dfb479d367e5f5902f051c823f9aef836e04791)
 
 	const i18n = getContext('i18n');
 
@@ -138,27 +128,6 @@
 	<div
 		class="min-h-screen max-h-screen w-full flex flex-col text-gray-700 dark:text-gray-100 bg-white dark:bg-gray-900"
 	>
-<<<<<<< HEAD
-		<div class="flex flex-col flex-auto justify-center py-8">
-			<div class="px-3 w-full max-w-5xl mx-auto">
-				<div>
-					<div class=" text-3xl font-semibold line-clamp-1">
-						{title}
-					</div>
-
-					<div class=" mt-1 text-gray-400">
-						{dayjs(chat.chat.timestamp).format($i18n.t('MMMM DD, YYYY'))}
-					</div>
-				</div>
-
-				<hr class="border-gray-50 dark:border-gray-850 mt-6 mb-2" />
-			</div>
-
-			<div class=" flex flex-col w-full flex-auto overflow-auto h-0" id="messages-container">
-				<div class=" h-full w-full flex flex-col py-4">
-					<div class="py-2">
-						<Messages
-=======
 		<div class="flex flex-col flex-auto justify-center relative">
 			<div class=" flex flex-col w-full flex-auto overflow-auto h-0" id="messages-container">
 				<div class="pt-5 px-2 w-full max-w-5xl mx-auto">
@@ -179,7 +148,6 @@
 					<div class="">
 						<Messages
 							className="h-full flex pt-4 pb-8"
->>>>>>> c2b1693 (GitHub deploy: 1dfb479d367e5f5902f051c823f9aef836e04791)
 							{user}
 							chatId={$chatId}
 							readOnly={true}
@@ -196,8 +164,6 @@
 					</div>
 				</div>
 			</div>
-<<<<<<< HEAD
-=======
 
 			<div
 				class="absolute bottom-0 right-0 left-0 flex justify-center w-full bg-gradient-to-b from-transparent to-gray-900"
@@ -211,7 +177,6 @@
 					</button>
 				</div>
 			</div>
->>>>>>> c2b1693 (GitHub deploy: 1dfb479d367e5f5902f051c823f9aef836e04791)
 		</div>
 	</div>
 {/if}