imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

5
src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js
View file

@ -18,12 +18,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import {_t} from "../../../../../languageHandler";
import RoomProfileSettings from "../../../room_settings/RoomProfileSettings";
<<<<<<< HEAD
import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
import * as sdk from "../../../../..";
=======
import sdk from "../../../../..";
>>>>>>> develop
import AccessibleButton from "../../../elements/AccessibleButton";
import dis from "../../../../../dispatcher";
import LabelledToggleSwitch from "../../../elements/LabelledToggleSwitch";

6
src/components/views/settings/tabs/user/FlairUserSettingsTab.js
View file

@ -17,12 +17,6 @@ limitations under the License.
import React from 'react';
import {_t} from "../../../../../languageHandler";
import GroupUserSettings from "../../../groups/GroupUserSettings";
<<<<<<< HEAD
import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
import PropTypes from "prop-types";
import {MatrixClient} from "matrix-js-sdk";
=======
>>>>>>> develop
export default class FlairUserSettingsTab extends React.Component {
render() {