toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix bad merge

Browse source
This commit is contained in:
Elias Nahum 2022-12-06 14:15:23 +02:00
parent 8ed78b807c
commit 5992a85dfb
No known key found for this signature in database
GPG key ID: E038DB71E0B61702
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/components/markdown/markdown.tsx
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';