From 0cae5dea3a4e4aa499187c4469c254d1650e980b Mon Sep 17 00:00:00 2001
From: Ivan Shmidt <bahoc47@gmail.com>
Date: Tue, 26 May 2020 16:44:49 +0200
Subject: [PATCH] fix: conflict resolution leftover

---
 plugins/catalog-backend/src/catalog/DatabaseLocationsCatalog.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/catalog-backend/src/catalog/DatabaseLocationsCatalog.ts b/plugins/catalog-backend/src/catalog/DatabaseLocationsCatalog.ts
index f571a20cfa..d79769a5a7 100644
--- a/plugins/catalog-backend/src/catalog/DatabaseLocationsCatalog.ts
+++ b/plugins/catalog-backend/src/catalog/DatabaseLocationsCatalog.ts
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-import { AddLocation, Location, LocationsCatalog } from './types';
 import { LocationReader } from '../ingestion';
 import { Database, DatabaseLocationUpdateLogEvent } from '../database';
 import {