fixed duplicate import from merge

pull/21833/head
Aleks Kissinger 2020-11-10 18:26:09 +00:00
parent 5f3af7863a
commit 8233ce77cb
1 changed files with 0 additions and 1 deletions

View File

@ -33,7 +33,6 @@ import SettingsStore from './settings/SettingsStore';
import cheerio from 'cheerio'; import cheerio from 'cheerio';
import {MatrixClientPeg} from './MatrixClientPeg'; import {MatrixClientPeg} from './MatrixClientPeg';
import SettingsStore from './settings/SettingsStore';
import {tryTransformPermalinkToLocalHref} from "./utils/permalinks/Permalinks"; import {tryTransformPermalinkToLocalHref} from "./utils/permalinks/Permalinks";
import {SHORTCODE_TO_EMOJI, getEmojiFromUnicode} from "./emoji"; import {SHORTCODE_TO_EMOJI, getEmojiFromUnicode} from "./emoji";
import ReplyThread from "./components/views/elements/ReplyThread"; import ReplyThread from "./components/views/elements/ReplyThread";