From d0d84af7ee692236ba05d7b74aef93bc39fbe805 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 27 Oct 2022 06:50:25 +0200
Subject: [PATCH] fix merging errors

---
 backend/.env.dist           | 1 +
 backend/src/config/index.ts | 6 ------
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/backend/.env.dist b/backend/.env.dist
index 65410f240..3b6fe2ce4 100644
--- a/backend/.env.dist
+++ b/backend/.env.dist
@@ -4,6 +4,7 @@ CONFIG_VERSION=v11.2022-10-27
 PORT=4000
 JWT_SECRET=secret123
 JWT_EXPIRES_IN=10m
+GRAPHIQL=false
 GDT_API_URL=https://gdt.gradido.net
 
 # Database
diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts
index 73a934dce..3d796af2c 100644
--- a/backend/src/config/index.ts
+++ b/backend/src/config/index.ts
@@ -11,7 +11,6 @@ Decimal.set({
 
 const constants = {
   DB_VERSION: '0051-add_delete_by_to_contributions',
-  DECAY_START_TIME: new Date('2021-05-13 17:46:31'), // GMT+0
   DECAY_START_TIME: new Date('2021-05-13 17:46:31-0000'), // GMT+0
   LOG4JS_CONFIG: 'log4js-config.json',
   // default log level on production should be info
@@ -117,11 +116,6 @@ if (
   )
 }
 
-const eventProtocol = {
-  // global switch to enable writing of EventProtocol-Entries
-  EVENT_PROTOCOL_DISABLED: process.env.EVENT_PROTOCOL_DISABLED === 'true' || false,
-}
-
 const federation = {
   DHT_TOPIC: process.env.DHT_TOPIC || null,
 }