IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve conflicts

Browse Source
This commit is contained in:
Claus-Peter Hübner 2022-11-25 03:11:14 +01:00
parent efa46f50f3
commit 9395b5a0ba
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
backend/src/index.ts
View File

@ -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
}
}