From 7163ed1daf385420f5b6927864f041affe24872e Mon Sep 17 00:00:00 2001
From: NfoAlex <40430040+NfoAlex@users.noreply.github.com>
Date: Tue, 4 Jul 2023 20:17:26 +0900
Subject: [PATCH] =?UTF-8?q?[fix]=20-=20=E3=82=B5=E3=83=BC=E3=83=90?=
 =?UTF-8?q?=E3=83=BC=E3=83=87=E3=83=BC=E3=82=BF=E3=81=AEJSON=E9=81=A9?=
 =?UTF-8?q?=E7=94=A8=E3=81=8C=E3=81=94=E3=81=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dbControl.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dbControl.js b/dbControl.js
index 17ea590..465358b 100644
--- a/dbControl.js
+++ b/dbControl.js
@@ -90,7 +90,7 @@ try { //読み込んでみる
     //serverデータを読み取り
     let dataServerLoaded = JSON.parse(fs.readFileSync('./server.json', 'utf-8')); //サーバー情報のJSON読み込み
     //テンプレに上書きする感じでサーバー情報を取り込む
-    dataServer = {...dataServerInitText, ...dataServerLoaded};
+    dataServer = {...JSON.parse(dataServerInitText), ...dataServerLoaded};
 } catch(e) {
     //初期のサーバー情報
     fs.writeFileSync("./server.json", dataServerInitText); //JSONファイルを作成