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

16
src/async-components/views/dialogs/EncryptedEventDialog.js
View file

@ -14,28 +14,18 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
<<<<<<< HEAD
import React from "react";
=======
import {Key} from "../../../Keyboard";
const React = require("react");
>>>>>>> develop
import createReactClass from 'create-react-class';
import PropTypes from 'prop-types';
import { _t } from '../../../languageHandler';
import {MatrixClientPeg} from "../../../MatrixClientPeg";
import {Key} from "../../../Keyboard";
import * as sdk from "../../../index";
const sdk = require('../../../index');
<<<<<<< HEAD
export default createReactClass({
=======
// XXX: This component is not cross-signing aware.
// https://github.com/vector-im/riot-web/issues/11752 tracks either updating this
// component or taking it out to pasture.
module.exports = createReactClass({
>>>>>>> develop
export default createReactClass({
displayName: 'EncryptedEventDialog',
propTypes: {

6
src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
View file

@ -17,15 +17,9 @@ limitations under the License.
import React from 'react';
import FileSaver from 'file-saver';
<<<<<<< HEAD
import * as sdk from '../../../../index';
import {MatrixClientPeg} from '../../../../MatrixClientPeg';
=======
import PropTypes from 'prop-types';
import sdk from '../../../../index';
import MatrixClientPeg from '../../../../MatrixClientPeg';
>>>>>>> develop
import { scorePassword } from '../../../../utils/PasswordScorer';
import { _t } from '../../../../languageHandler';
import { accessSecretStorage } from '../../../../CrossSigningManager';