nikrozman/element-web
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fix import merge conflicts, removing any that aren't needed anymore

Browse Source 
Many imports were removed as part of refactoring work, so here we are.
This commit is contained in:
Travis Ralston
2020-01-09 14:15:38 -07:00
parent a0da13200f
commit 3e5cc9550b
26 changed files with 6 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/views/dialogs/DevtoolsDialog.js
View File

@@ -16,18 +16,10 @@ limitations under the License.
import React from 'react';
import PropTypes from 'prop-types';
<<<<<<< HEAD
import * as sdk from '../../../index';
import SyntaxHighlight from '../elements/SyntaxHighlight';
import { _t } from '../../../languageHandler';
import {MatrixClientPeg} from '../../../MatrixClientPeg';
=======
import { Room } from "matrix-js-sdk";
import sdk from '../../../index';
import SyntaxHighlight from '../elements/SyntaxHighlight';
import { _t } from '../../../languageHandler';
>>>>>>> develop
import Field from "../elements/Field";
import MatrixClientContext from "../../../contexts/MatrixClientContext";

7
src/components/views/dialogs/RoomSettingsDialog.js
View File

@@ -24,14 +24,9 @@ import RolesRoomSettingsTab from "../settings/tabs/room/RolesRoomSettingsTab";
import GeneralRoomSettingsTab from "../settings/tabs/room/GeneralRoomSettingsTab";
import SecurityRoomSettingsTab from "../settings/tabs/room/SecurityRoomSettingsTab";
import NotificationSettingsTab from "../settings/tabs/room/NotificationSettingsTab";
<<<<<<< HEAD
import BridgeSettingsTab from "../settings/tabs/room/BridgeSettingsTab";
import * as sdk from "../../../index";
import {MatrixClientPeg} from "../../../MatrixClientPeg";
=======
import BridgeSettingsTab from "../settings/tabs/room/BridgeSettingsTab";
import sdk from "../../../index";
import MatrixClientPeg from "../../../MatrixClientPeg";
>>>>>>> develop
import dis from "../../../dispatcher";
import SettingsStore from "../../../settings/SettingsStore";

6
src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
View File

@@ -16,15 +16,9 @@ limitations under the License.
*/
import React from 'react';
<<<<<<< HEAD
import * as sdk from '../../../../index';
import {MatrixClientPeg} from '../../../../MatrixClientPeg';
=======
import { MatrixClient } from 'matrix-js-sdk';
import sdk from '../../../../index';
import MatrixClientPeg from '../../../../MatrixClientPeg';
>>>>>>> develop
import Modal from '../../../../Modal';
import { _t } from '../../../../languageHandler';
import {Key} from "../../../../Keyboard";