From d867ee1a5000448f7f136691d422bdd6824f1747 Mon Sep 17 00:00:00 2001 From: Aaron Raimist Date: Wed, 27 Oct 2021 22:02:59 -0500 Subject: [PATCH] Fix merge error Signed-off-by: Aaron Raimist --- src/SecurityManager.ts | 2 -- src/TextForEvent.tsx | 1 - 2 files changed, 3 deletions(-) diff --git a/src/SecurityManager.ts b/src/SecurityManager.ts index 0c3f6f776c..e5f6acfba4 100644 --- a/src/SecurityManager.ts +++ b/src/SecurityManager.ts @@ -22,8 +22,6 @@ import { decodeRecoveryKey } from 'matrix-js-sdk/src/crypto/recoverykey'; import { encodeBase64 } from "matrix-js-sdk/src/crypto/olmlib"; import { DeviceTrustLevel } from 'matrix-js-sdk/src/crypto/CrossSigning'; import { logger } from "matrix-js-sdk/src/logger"; -import { DeviceTrustLevel } from 'matrix-js-sdk/src/crypto/CrossSigning'; -import { logger } from "matrix-js-sdk/src/logger"; import { ComponentType } from "react"; import Modal from './Modal'; diff --git a/src/TextForEvent.tsx b/src/TextForEvent.tsx index 1586100dee..a8cff409a8 100644 --- a/src/TextForEvent.tsx +++ b/src/TextForEvent.tsx @@ -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";