matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-16 22:01:54 +03:00
Code 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

11
src/components/structures/TimelinePanel.js
View File

@ -25,22 +25,13 @@ import PropTypes from 'prop-types';
import {EventTimeline} from "matrix-js-sdk";
import * as Matrix from "matrix-js-sdk";
import { _t } from '../../languageHandler';
<<<<<<< HEAD
import {MatrixClientPeg} from "../../MatrixClientPeg";
import * as ObjectUtils from "../../ObjectUtils";
import UserActivity from "../../UserActivity";
import Modal from "../../Modal";
import dis from "../../dispatcher";
import * as sdk from "../../index";
import { KeyCode } from '../../Keyboard';
=======
const MatrixClientPeg = require("../../MatrixClientPeg");
const dis = require("../../dispatcher");
const ObjectUtils = require('../../ObjectUtils');
const Modal = require("../../Modal");
const UserActivity = require("../../UserActivity");
import {Key} from '../../Keyboard';
>>>>>>> develop
import { Key } from '../../Keyboard';
import Timer from '../../utils/Timer';
import shouldHideEvent from '../../shouldHideEvent';
import EditorStateTransfer from '../../utils/EditorStateTransfer';