OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

not sure how I butchered this merge conflict resolution this much.

pull/21833/head
Michael Telatynski 2021-06-03 19:37:26 +01:00
parent 93010d34fd
commit 5d0d81e79a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/structures/RoomView.tsx
View File

@ -79,8 +79,8 @@ import { Container, WidgetLayoutStore } from "../../stores/widgets/WidgetLayoutS
import { getKeyBindingsManager, RoomAction } from '../../KeyBindingsManager'; import { getKeyBindingsManager, RoomAction } from '../../KeyBindingsManager';
import { objectHasDiff } from "../../utils/objects"; import { objectHasDiff } from "../../utils/objects";
import SpaceRoomView from "./SpaceRoomView"; import SpaceRoomView from "./SpaceRoomView";
import { IOpts } from "../../createRoom import { IOpts } from "../../createRoom";
import { replaceableComponent } from "../../utils/replaceableComponent import { replaceableComponent } from "../../utils/replaceableComponent";
import { omit } from 'lodash'; import { omit } from 'lodash';
import UIStore from "../../stores/UIStore"; import UIStore from "../../stores/UIStore";