From 3dad15de7257207cf6191825f2979cba793acc2d Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 20 Oct 2018 13:51:05 -0600
Subject: [PATCH] Fix bad merge

---
 src/db/BridgeStore.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/db/BridgeStore.ts b/src/db/BridgeStore.ts
index d8ff425..c5ebddf 100644
--- a/src/db/BridgeStore.ts
+++ b/src/db/BridgeStore.ts
@@ -1,5 +1,4 @@
-import { Bridge, TelegramBridgeConfiguration } from "../integrations/Bridge";
-import { Bridge, WebhookBridgeConfiguration } from "../integrations/Bridge";
+import { Bridge, TelegramBridgeConfiguration, WebhookBridgeConfiguration } from "../integrations/Bridge";
 import BridgeRecord from "./models/BridgeRecord";
 import { IrcBridge } from "../bridges/IrcBridge";
 import { LogService } from "matrix-js-snippets";