Fix merge conflict

This commit is contained in:
Alsturit 2022-08-18 03:11:42 -05:00
parent 41ae84274e
commit 96a7ec46c3
No known key found for this signature in database
GPG Key ID: 4F57E6793C946CEC
1 changed files with 10 additions and 0 deletions

View File

@ -327,3 +327,13 @@ http://ye23.vip/z7z8/2021/kbs2020.php?id=8
http://han.ddkdxmkj.com/api/han123.php?id=15
#EXTINF:-1 tvg-id="AniplusAsia.sg",Aniplus (Indonesian subtitle)
http://210.210.155.35/session/05ca7a1e-5492-11eb-901e-b82a72d63267/dr9445/h/h02/01.m3u8
#EXTINF:-1 tvg-id="CJBTV.kr" status="online",CJB청주방송 (SBS Cheongju) (540p) [Not 24/7]
http://1.222.207.80:1935/live/cjbtv/playlist.m3u8
#EXTINF:-1 tvg-id="KBCTV.kr" status="timeout",KBC 광주방송 (SBS Gwangju) (1080p)
http://119.200.131.11:1935/KBCTV/tv/playlist.m3u8
#EXTINF:-1 tvg-id="YeosuMBCTV.kr" status="online",여수MBC (MBC Yeosu) (720p) [Not 24/7]
https://5c3639aa99149.streamlock.net/live_TV/tv/playlist.m3u8
#EXTINF:-1 tvg-id="ChungbukMBCTV.kr" status="",충북MBC (MBC Chungbuk) (720p)
http://211.33.246.4:32954/cj_live/myStream.sdp/playlist.m3u8
#EXTINF:-1 tvg-id="UlsanMBCTV.kr" status="",울산MBC (MBC Ulsan) (540p)
https://5ddfd163bd00d.streamlock.net/nHDTV/nHDTV/playlist.m3u8