Fix merge error

Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-10-27 22:03:02 -05:00
parent f738ad51bd
commit d867ee1a50
2 changed files with 0 additions and 3 deletions
@@ -18,7 +18,6 @@ import React from 'react';
 import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 import { logger } from "matrix-js-sdk/src/logger";
 import { removeDirectionOverrideChars } from 'matrix-js-sdk/src/utils';
-import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 import { GuestAccess, HistoryVisibility, JoinRule } from "matrix-js-sdk/src/@types/partials";
 import { EventType, MsgType } from "matrix-js-sdk/src/@types/event";