From 23819602779db640cc9855e487905086a4df0375 Mon Sep 17 00:00:00 2001
From: JustTemmie <47639983+JustTemmie@users.noreply.github.com>
Date: Wed, 16 Jul 2025 04:51:18 +0200
Subject: [PATCH] fix: incorrect merge

---
 components/Message.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/components/Message.vue b/components/Message.vue
index 536487c..919120d 100644
--- a/components/Message.vue
+++ b/components/Message.vue
@@ -69,9 +69,6 @@ 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';
->>>>>>>>> Temporary merge branch 2
 
 const props = defineProps<MessageProps>();