Merge conflict

This commit is contained in:
Alsturit
2022-09-06 09:42:11 -05:00
83 changed files with 1060 additions and 1069 deletions

View File

@@ -359,12 +359,12 @@ https://5856e1a25f71a.streamlock.net/easycast9-live/_definst_/mp4:livestreamhd10
https://fms.nrwision.de/live/livestreamHD.stream_source/playlist.m3u8
#EXTINF:-1 tvg-id="" status="online",Isar TV (1080p) [Not 24/7]
https://isar-tv.iptv-playoutcenter.de/isar-tv/isar-tv.stream_1/playlist.m3u8
#EXTINF:-1 tvg-id="" status="online",MyTVplus (Dresden) (576p)
https://mytvplus.iptv-playoutcenter.de/mytvplus/mytvplus.stream_1/playlist.m3u8
#EXTINF:-1 tvg-id="" status="online",Franken Fernsehen (1080p)
https://s3.welocal.world/frankenfernsehen/media/191627/videos/hls.m3u8
#EXTINF:-1 tvg-id="" status="online",TVO (1080p) [Not 24/7]
https://tvoberfranken.iptv-playoutcenter.de/tvoberfranken/tvoberfranken.stream_1/playlist.m3u8
#EXTINF:-1 tvg-id="" status="online",MyTVplus (Dresden) (576p)
https://mytvplus.iptv-playoutcenter.de/mytvplus/mytvplus.stream_1/playlist.m3u8
#EXTINF:-1 tvg-id="" status="online",Antenne Vorarlberg (720p) [Not 24/7]
http://5857db5306b83.streamlock.net/antennevorarlberg-live/_definst_/mp4:livestream/playlist.m3u8
#EXTINF:-1 tvg-id="" status="online",BR Fernsehen Nord (720p) [Geo-blocked]
@@ -375,8 +375,6 @@ http://livestreams.br.de/i/bralpha_germany@119899/master.m3u8
https://brlive-lh.akamaihd.net/i/bfsnord_germany@119898/master.m3u8
#EXTINF:-1 tvg-id="" status="online",ARD-alpha (720p) [Not 24/7]
https://brlive-lh.akamaihd.net/i/bralpha_germany@119899/master.m3u8
#EXTINF:-1 tvg-id="" status="online",Motorvision (576p)
http://210.210.155.37/uq2663/h/h09/index.m3u8
#EXTINF:-1 tvg-id="" status="online" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",DW (480p)
#EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148
http://ott-cdn.ucom.am/s26/index.m3u8