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/avatars/BaseAvatar.js
View file

@ -20,12 +20,7 @@ limitations under the License.
import React from 'react';
import PropTypes from 'prop-types';
import createReactClass from 'create-react-class';
<<<<<<< HEAD
import { MatrixClient } from 'matrix-js-sdk';
import * as AvatarLogic from '../../../Avatar';
=======
import AvatarLogic from '../../../Avatar';
>>>>>>> develop
import SettingsStore from "../../../settings/SettingsStore";
import AccessibleButton from '../elements/AccessibleButton';
import MatrixClientContext from "../../../contexts/MatrixClientContext";