From 5992a85dfb523f6dc5a230b5fe64323ef97ecfa3 Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Tue, 6 Dec 2022 14:15:23 +0200
Subject: [PATCH] fix bad merge

---
 app/components/markdown/markdown.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/components/markdown/markdown.tsx b/app/components/markdown/markdown.tsx
index 84f60b2e34..c0012c13fb 100644
--- a/app/components/markdown/markdown.tsx
+++ b/app/components/markdown/markdown.tsx
@@ -11,7 +11,7 @@ import Emoji from '@components/emoji';
 import FormattedText from '@components/formatted_text';
 import Hashtag from '@components/markdown/hashtag';
 import {computeTextStyle} from '@utils/markdown';
-import {blendColors, changeOpacity, makeStyleSheetFromTheme} from '@utils/theme';
+import {blendColors, changeOpacity, concatStyles, makeStyleSheetFromTheme} from '@utils/theme';
 import {getScheme} from '@utils/url';
 
 import AtMention from './at_mention';