fix: incorrect merge

Reviewed-on: #40
Reviewed-by: SauceyRed <saucey@saucey.red>

components/Message.vue

@@ -5,9 +5,7 @@
 		<div v-if="props.replyMessage" class="message-reply-svg">
 			<svg
 				width="1.5em" height="1.5em"
-				viewBox="0 0 151.14355 87.562065" version="1.1" id="svg1"
+				viewBox="0 0 150 87.5" version="1.1" id="svg1"
-				xmlns="http://www.w3.org/2000/svg"
-				xmlns:svg="http://www.w3.org/2000/svg"
 				style="overflow: visible;">
 				<defs id="defs1" />
 				<g id="layer1"
@@ -68,9 +66,9 @@
 import DOMPurify from 'dompurify';
 import { parse } from 'marked';
 import type { MessageProps } from '~/types/props';
+import generateIrcColor from '~/utils/generateIrcColor';
 import MessageMedia from './MessageMedia.vue';
 import MessageReply from './UserInterface/MessageReply.vue';
-import generateIrcColor from '~/utils/generateIrcColor';
 
 const props = defineProps<MessageProps>();
 

layouts/client.vue

@@ -36,7 +36,7 @@
 				<div class="left-column-segment">
 					<div ref="createButtonContainer">
 						<button id="create-button" class="sidebar-bottom-buttons" @click.prevent="createDropdown">
-							<Icon id="create-icon" name="lucide:square-plus" alt="Create guild"/>
+							<Icon id="create-icon" name="lucide:square-plus" alt="Create or join guild"/>
 						</button>
 					</div>
 					<NuxtLink id="settings-menu" class="sidebar-bottom-buttons" href="/settings">
@@ -153,47 +153,6 @@ const options = [
 
 const guilds: GuildResponse[] | undefined = await fetchWithApi("/me/guilds");
 
-//const servers = await fetchWithApi("/servers") as { uuid: string, name: string, description: string }[];
-//console.log("servers:", servers);
-const members = [
-	{
-		id: "3287484395",
-		displayName: "SauceyRed"
-	},
-	{
-		id: "3287484395",
-		displayName: "SauceyRed"
-	},
-	{
-		id: "3287484395",
-		displayName: "SauceyRed"
-	},
-	{
-		id: "3287484395",
-		displayName: "SauceyRed"
-	},
-	{
-		id: "3287484395",
-		displayName: "SauceyRed"
-	},
-	{
-		id: "3287484395",
-		displayName: "SauceyRed"
-	},
-	{
-		id: "3287484395",
-		displayName: "SauceyRed"
-	},
-	{
-		id: "3287484395",
-		displayName: "SauceyRed"
-	},
-	{
-		id: "3287484395",
-		displayName: "SauceyRed"
-	}
-];
-
 function createDropdown() {
 	const dropdown = h(GuildDropdown, { options });
 	const div = document.createElement("div");