From 0e760f38821ec94be00b59886b7e88b79d17f635 Mon Sep 17 00:00:00 2001
From: dharm pimsen <64675096+damp11113@users.noreply.github.com>
Date: Tue, 27 Feb 2024 20:50:10 +0700
Subject: [PATCH] Update Settings.py

---
 Server/Settings.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Server/Settings.py b/Server/Settings.py
index 0bfe478..c65367a 100644
--- a/Server/Settings.py
+++ b/Server/Settings.py
@@ -47,8 +47,5 @@ public = True
 ServerIP = "localhost"
 #ServerPort = server_port[1]
 ServerPort = 6980
-<<<<<<< HEAD
 ThaiSDRkey = ""
-=======
-ThaiSDRkey = ""
->>>>>>> 53163be3dc12010715271f6020a0c07d2af720ec
+