Fix bad merge

This commit is contained in:
Travis Ralston 2018-10-20 13:51:05 -06:00
parent 2416718065
commit 3dad15de72

View file

@ -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";