Merge conflict

This commit is contained in:
Alsturit committed 2022-09-06 09:42:11 -05:00
commit b6268ec082
83 files changed
+1060 -1069

No files matched your search

+1 -1
View File
@@ -135,7 +135,7 @@ https://live.salto.nl/hls/at5.m3u8
https://salto-streams.nl/hls/sotv1.m3u8
#EXTINF:-1 tvg-id="Samen1TV.nl" status="online",Samen1 TV (720p)
https://server-67.stream-server.nl:1936/Samen1TV/Samen1TV/playlist.m3u8
#EXTINF:-1 tvg-id="SirisTV.nl" status="online",Siris TV (720p) [Not 24/7]
#EXTINF:-1 tvg-id="SirisTV.nl" status="error",Siris TV (720p) [Not 24/7]
https://cdn.streammy.events/siris/tv/playlist.m3u8
#EXTINF:-1 tvg-id="StreekTV.nl" status="online",Streek TV (720p) [Not 24/7]
http://cdn22.streampartner.nl/streektv/streektv/playlist.m3u8