From db1ff45e0e1498f009bd89bf7fdeff0f1ecf96a9 Mon Sep 17 00:00:00 2001
From: straticspaff <straticspaff@gmail.com>
Date: Sat, 18 Nov 2023 05:37:15 +0000
Subject: [PATCH] fix conflict

---
 config.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config.json b/config.json
index a62b45325..c1012dd72 100644
--- a/config.json
+++ b/config.json
@@ -20,7 +20,7 @@
     "MaxLauncherHR": false,
     "LogInboundMessages": true,
     "LogOutboundMessages": true,
-    "MaxHexdumpLength": 256,
+    "MaxHexdumpLength": 999999,
     "DivaEvent": 0,
     "FestaEvent": -1,
     "TournamentEvent": 0,
@@ -123,8 +123,8 @@
     "Host": "localhost",
     "Port": 5432,
     "User": "postgres",
-    "Password": "",
-    "Database": "erupe"
+    "Password": "445566",
+    "Database": "main"
   },
   "Sign": {
     "Enabled": true,