From 3dfbc6e160d328fe46e07f4f2902638e4b14a775 Mon Sep 17 00:00:00 2001
From: Nikita Nek Dudnik <nikdudnik@gmail.com>
Date: Thu, 4 Jun 2020 10:12:52 +0200
Subject: [PATCH] fix: merge errors

---
 plugins/catalog-backend/src/service/standaloneApplication.ts | 1 -
 plugins/catalog-backend/src/service/standaloneServer.ts      | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/catalog-backend/src/service/standaloneApplication.ts b/plugins/catalog-backend/src/service/standaloneApplication.ts
index db24f9d224..bdf296d06b 100644
--- a/plugins/catalog-backend/src/service/standaloneApplication.ts
+++ b/plugins/catalog-backend/src/service/standaloneApplication.ts
@@ -27,7 +27,6 @@ import { Logger } from 'winston';
 import { EntitiesCatalog, LocationsCatalog } from '../catalog';
 import { HigherOrderOperation } from '../ingestion';
 import { createRouter } from './router';
-import { HigherOrderOperation } from '../ingestion/types';
 
 export interface ApplicationOptions {
   enableCors: boolean;
diff --git a/plugins/catalog-backend/src/service/standaloneServer.ts b/plugins/catalog-backend/src/service/standaloneServer.ts
index 8bf3554510..51fc8be829 100644
--- a/plugins/catalog-backend/src/service/standaloneServer.ts
+++ b/plugins/catalog-backend/src/service/standaloneServer.ts
@@ -15,7 +15,7 @@
  */
 
 import { Server } from 'http';
-import { Logger } from 'winston';
+import { Logger, log } from 'winston';
 import knex from 'knex';
 import { createStandaloneApplication } from './standaloneApplication';
 import { DatabaseEntitiesCatalog } from '../catalog/DatabaseEntitiesCatalog';
@@ -49,6 +49,7 @@ export async function startStandaloneServer(
     entitiesCatalog,
     locationsCatalog,
     ingestionModel,
+    logger,
   );
 
   logger.debug('Creating application...');