cleanup bad imports

Signed-off-by: Johan Haals <johan.haals@gmail.com>
2021-08-16 09:58:57 +02:00
parent 8fbf7b7452
commit 2fc711c675
1 changed files with 0 additions and 3 deletions
@@ -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 {