fix bad merge

This commit is contained in:
Elias Nahum
2022-12-06 14:15:23 +02:00
parent 8ed78b807c
commit 5992a85dfb

View File

@@ -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';