Merge conflict

This commit is contained in:
Alsturit
2022-08-16 11:23:58 -05:00
91 changed files with 1296 additions and 1296 deletions

View File

@@ -57,7 +57,7 @@ https://stream.chmbc.co.kr/live/TV/playlist.m3u8
https://allanf181.github.io/adaptive-streams/streams/kr/ChunghwaTV.m3u8
#EXTINF:-1 tvg-id="CinemaHeaven.kr" status="online",Cinema Heaven (1080p) [Not 24/7]
https://allanf181.github.io/adaptive-streams/streams/kr/CinemaHeaven.m3u8
#EXTINF:-1 tvg-id="CJBTV.kr" status="online",CJB청주방송 (SBS Cheongju) (540p) [Not 24/7]
#EXTINF:-1 tvg-id="CJBTV.kr" status="blocked",CJB청주방송 (SBS 淸州) (540p) [Not 24/7]
http://1.222.207.80:1935/live/cjbtv/playlist.m3u8
#EXTINF:-1 tvg-id="CJOnStyle.kr" status="online",CJ OnStyle (540p)
https://live-ch1.cjonstyle.net/cjmalllive/stream2/playlist.m3u8
@@ -273,7 +273,7 @@ http://live.worktv.or.kr:1935/live/wowtvlive1.sdp/playlist.m3u8
http://59.23.231.102:1935/live/UBCstream/playlist.m3u8
#EXTINF:-1 tvg-id="Viki.kr" status="online",Viki (1080p) [Not 24/7]
https://allanf181.github.io/adaptive-streams/streams/kr/Viki.m3u8
#EXTINF:-1 tvg-id="YeosuMBCTV.kr" status="online",여수MBC (MBC Yeosu) (720p) [Not 24/7]
#EXTINF:-1 tvg-id="YeosuMBCTV.kr" status="online",MBC Yeosu (720p) [Not 24/7]
https://5c3639aa99149.streamlock.net/live_TV/tv/playlist.m3u8
#EXTINF:-1 tvg-id="YonhapNewsTV.kr" status="online",Yonhap News TV (1080p) [Not 24/7]
https://allanf181.github.io/adaptive-streams/streams/kr/YonhapNewsTV.m3u8