resolved merge conflict in main.py

README.md

@@ -8,4 +8,5 @@ pinned: false
 short_description: Listen to the radio with Reachy Mini !
 tags:
  - reachy_mini
+ - reachy_mini_python_app
 ---

reachy_mini_radio/alarm_settings.json

@@ -1,7 +1,7 @@
 {
-  "enabled": true,
+  "enabled": false,
   "alarm_mode": false,
-  "time": "09:00",
+  "time": "07:20",
   "station_url": "https://streaming.smartradio.ch:9502/stream",
   "station_name": "A Fine Jazz Gumbo Radio",
   "timezone": "America/Los_Angeles"

reachy_mini_radio/webradios.json

@@ -2,5 +2,13 @@
   {
     "name": "A Fine Jazz Gumbo Radio",
     "url": "https://streaming.smartradio.ch:9502/stream"
+  },
+  {
+    "name": "100.5 The Fox",
+    "url": "https://cloud-proxy-hls.revma.ihrhls.com/zc2938/hls.m3u8?rj-org=n0bb-e2&rj-ttl=5&rj-tok=AAABmuU8gY4AmS-J09808GxN2g"
+  },
+  {
+    "name": "92.5 The Breeze",
+    "url": "https://cloud.revma.ihrhls.com/zc4366?rj-org=n2eb-e2&rj-ttl=5&rj-tok=AAABmuV3vVIAOF5UGGE1WgcYeA"
   }
 ]