fix conflict

ZeruLight · Nov 18, 2023 · db1ff45 · db1ff45
1 parent 25d7e77
commit db1ff45
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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,