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

10
src/components/views/room_settings/AliasSettings.js
View file

@ -15,25 +15,15 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
<<<<<<< HEAD
import React from "react";
=======
import EditableItemList from "../elements/EditableItemList";
import React, {createRef} from 'react';
>>>>>>> develop
import PropTypes from 'prop-types';
import {MatrixClientPeg} from "../../../MatrixClientPeg";
import * as sdk from "../../../index";
import { _t } from '../../../languageHandler';
import Field from "../elements/Field";
import ErrorDialog from "../dialogs/ErrorDialog";
<<<<<<< HEAD
import Modal from "../../../Modal";
=======
import AccessibleButton from "../elements/AccessibleButton";
const Modal = require("../../../Modal");
>>>>>>> develop
class EditableAliasesList extends EditableItemList {
constructor(props) {

7
src/components/views/room_settings/RelatedGroupSettings.js
View file

@ -16,13 +16,8 @@ limitations under the License.
import React from 'react';
import PropTypes from 'prop-types';
<<<<<<< HEAD
import {MatrixEvent, MatrixClient} from 'matrix-js-sdk';
import * as sdk from '../../../index';
=======
import {MatrixEvent} from 'matrix-js-sdk';
import sdk from '../../../index';
>>>>>>> develop
import * as sdk from '../../../index';
import { _t } from '../../../languageHandler';
import Modal from '../../../Modal';
import ErrorDialog from "../dialogs/ErrorDialog";