From 2fc711c675dac56217c96239c6ac7d07d38a1d40 Mon Sep 17 00:00:00 2001
From: Johan Haals <johan.haals@gmail.com>
Date: Mon, 16 Aug 2021 09:58:57 +0200
Subject: [PATCH] cleanup bad imports

Signed-off-by: Johan Haals <johan.haals@gmail.com>
---
 .../src/next/database/DefaultProcessingDatabase.test.ts        | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/plugins/catalog-backend/src/next/database/DefaultProcessingDatabase.test.ts b/plugins/catalog-backend/src/next/database/DefaultProcessingDatabase.test.ts
index 5b717ee36e..09647b980c 100644
--- a/plugins/catalog-backend/src/next/database/DefaultProcessingDatabase.test.ts
+++ b/plugins/catalog-backend/src/next/database/DefaultProcessingDatabase.test.ts
@@ -20,11 +20,8 @@ import { Entity, stringifyEntityRef } from '@backstage/catalog-model';
 import { JsonObject } from '@backstage/config';
 import { Knex } from 'knex';
 import * as uuid from 'uuid';
-<<<<<<< HEAD
 import { Logger } from 'winston';
-=======
 import { DateTime } from 'luxon';
->>>>>>> d31a82869 (Catalog: Add refresh spread functionality)
 import { DatabaseManager } from './DatabaseManager';
 import { DefaultProcessingDatabase } from './DefaultProcessingDatabase';
 import {