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 1/2] 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
+

From 24fe915a8d61af806e64178becd95de42053127a Mon Sep 17 00:00:00 2001
From: dharm pimsen <64675096+damp11113@users.noreply.github.com>
Date: Tue, 27 Feb 2024 20:50:45 +0700
Subject: [PATCH 2/2] Update README.md

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0608e78..c52f065 100644
--- a/README.md
+++ b/README.md
@@ -13,12 +13,13 @@ IDRB is a novel internet radio broadcasting alternative that uses HLS/DASH/HTTP
 - [x] Encryption (Beta)
 - [x] Low Latency
 - [x] MultiChannel on one server
+- [x] Low bandwidth using
 - [x] [RDS](https://en.wikipedia.org/wiki/Radio_Data_System) but in **internet** (Dynamic updating)
 - [x] Images (Logo only) (on RDS)
 - [ ] [EPG](https://en.wikipedia.org/wiki/Electronic_program_guide) (on RDS)
 - [ ] AS (Alternative Server) (on RDS)
 - [ ] [EOM](https://en.wikipedia.org/wiki/Enhanced_other_networks) (on RDS)
-- [ ] Low bandwidth using
+
 
 ## Protocol
 - [x] TCP