Update in.m3u

streams/in.m3u

@@ -319,11 +319,7 @@ http://192.99.2.28/mandra_hls/mandra.m3u8
 https://gvjyg2n9doem-hls-live.5centscdn.com/navmediastream/d0dbe915091d400bd8ee7f27f0791303.sdp/chunks.m3u8
 #EXTINF:-1 tvg-id="" status="online",NVision
 http://live.singamcloud.in:1935/nvision/nvision/playlist.m3u8
-<<<<<<< Updated upstream
-#EXTINF:-1 tvg-id="" status="online",Relax TV (576p) [Not 24/7]
-=======
 #EXTINF:-1 tvg-id="RelaxTV.in" status="error",Relax TV (576p) [Not 24/7]
->>>>>>> Stashed changes
 http://198.144.149.82:8080/NOTV/RELAXTV/index.m3u8?token=GTR
 #EXTINF:-1 tvg-id="" status="online",Sada TV (1080p) [Not 24/7]
 http://cdn12.henico.net:8080/live/sadatv/index.m3u8