From 9395b5a0ba866db84363a8afd375ee9fe827b2ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Claus-Peter=20H=C3=BCbner?= <claus-peter.huebner@email.de>
Date: Fri, 25 Nov 2022 03:11:14 +0100
Subject: [PATCH] resolve conflicts

---
 backend/src/index.ts | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/backend/src/index.ts b/backend/src/index.ts
index 1be47eec2..35fb191cd 100644
--- a/backend/src/index.ts
+++ b/backend/src/index.ts
@@ -21,13 +21,8 @@ async function main() {
   // start DHT hyperswarm when DHT_TOPIC is set in .env
   if (CONFIG.FEDERATION_DHT_TOPIC) {
     // eslint-disable-next-line no-console
-<<<<<<< HEAD
     console.log(`Federation active on ${CONFIG.FEDERATION_DHT_TOPIC}`)
     await startDHT(CONFIG.FEDERATION_DHT_TOPIC) // con,
-=======
-    console.log(`Federation active on ${CONFIG.FEDERATE_DHT_TOPIC}`)
-    await startDHT(CONFIG.FEDERATE_DHT_TOPIC) // con,
->>>>>>> 192ab67817a12f0a765caa48c0e13272b7310b25
   }
 }