gorb/frontend
4
0
Fork 0
Code Issues 7 Pull requests 3 Projects Releases Packages 1 Wiki Activity Actions

fix: incorrect merge
All checks were successful
ci/woodpecker/push/build-and-publish Pipeline was successful
Details
ci/woodpecker/pr/build-and-publish Pipeline was successful
Details
ci/woodpecker/pull_request_closed/build-and-publish Pipeline was successful
Details

Browse source
This commit is contained in:
Twig 2025-07-16 04:51:18 +02:00
parent 29243aa86f
commit 2381960277
No known key found for this signature in database
1 changed files with 0 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
components/Message.vue
View file

@ -69,9 +69,6 @@ import type { MessageProps } from '~/types/props';
import generateIrcColor from '~/utils/generateIrcColor'; import generateIrcColor from '~/utils/generateIrcColor';
import MessageMedia from './MessageMedia.vue'; import MessageMedia from './MessageMedia.vue';
import MessageReply from './UserInterface/MessageReply.vue'; import MessageReply from './UserInterface/MessageReply.vue';
=========
import generateIrcColor from '~/utils/generateIrcColor';
>>>>>>>>> Temporary merge branch 2
const props = defineProps<MessageProps>(); const props = defineProps<MessageProps>();