Resolve conflict

This commit is contained in:
Alsturit 2022-07-17 03:33:17 -05:00
parent 161e8861e2
commit 0d1aee5379
No known key found for this signature in database
GPG Key ID: 4F57E6793C946CEC

View File

@ -27,7 +27,7 @@ http://cgntv-glive.ofsdelivery.net/live/cgntv_kr01/playlist.m3u8
http://cgntv-glive.ofsdelivery.net/live/cgntv_kr02/playlist.m3u8
#EXTINF:-1 tvg-id="ChuncheonMBCTV.kr" status="online",춘천MBC (MBC Chuncheon) (1080p) [Not 24/7]
https://stream.chmbc.co.kr/live/TV/playlist.m3u8
#EXTINF:-1 tvg-id="CJBTV.kr" status="blocked",CJB청주방송 (SBS 淸州) (540p) [Not 24/7]
#EXTINF:-1 tvg-id="CJBTV.kr" status="online",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
https://live-ch1.cjonstyle.net/cjmalllive/stream2/playlist.m3u8
@ -57,12 +57,12 @@ http://ebsonair.ebs.co.kr/plus2familypc/familypc1m/playlist.m3u8
http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel/UC8Sv6O3Ux8ePVqorx8aOBMg/live
#EXTINF:-1 tvg-id="ETV.kr" status="online",NEC ETV 한국선거방송 (720p)
http://necgokr2-724.acs.wecandeo.com/ms/2528/724/index_1.m3u8
#EXTINF:-1 tvg-id="GCN.kr" status="online",GCN24 Korean (1080p) [Not 24/7]
http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel/UCqGxkgVnPc7arUR7MdCi99g/live
#EXTINF:-1 tvg-id="GCN.kr" status="online",GCN24 Korean (480p) [Not 24/7]
http://liveko24-manminglobal3.ktcdn.co.kr/liveko24/gcnko_high/playlist.m3u8
#EXTINF:-1 tvg-id="GCN.kr" status="error",GCN (1080p) [Not 24/7]
http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel/UCFb1QuujJWU3nuUMCNPhNiA/live
#EXTINF:-1 tvg-id="GCN.kr" status="error",GCN24 Korean (1080p) [Not 24/7]
http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel/UCqGxkgVnPc7arUR7MdCi99g/live
#EXTINF:-1 tvg-id="GCNAmerica.us" status="online",GCN24 English (720p) [Not 24/7]
http://liveen24-manminglobal3.ktcdn.co.kr/liveen24/gcnus_high/playlist.m3u8
#EXTINF:-1 tvg-id="GSMyShop.kr" status="online",GS My Shop (1080p)
@ -75,7 +75,7 @@ http://mgugaklive.nowcdn.co.kr/gugakvideo/gugakvideo.stream/playlist.m3u8
http://mediaworks.dema.mil.kr:1935/live_edge/cudo.sdp/playlist.m3u8
#EXTINF:-1 tvg-id="JejuMBCTV.kr" status="online",제주 MBC (MBC Jeju) (352p) [Not 24/7]
https://wowza.jejumbc.com/live/tv_jejumbc/playlist.m3u8
#EXTINF:-1 tvg-id="JIBSTV.kr" status="timeout",JIBS SBS (720p) [Not 24/7]
#EXTINF:-1 tvg-id="JIBSTV.kr" status="online",JIBS SBS (720p) [Not 24/7]
http://123.140.197.22/stream/1/play.m3u8
#EXTINF:-1 tvg-id="JTV.kr" status="online",JTV SBS (406p) [Not 24/7]
https://61ff3340258d2.streamlock.net/jtv_live/myStream/playlist.m3u8
@ -87,8 +87,6 @@ http://kbs-dokdo.gscdn.com/dokdo_300/dokdo_300.stream/playlist.m3u8
http://kbs-dokdo.gscdn.com/sec_kbshomepage_300/sec_kbshomepage_300.stream/playlist.m3u8
#EXTINF:-1 tvg-id="KBSWorld.kr" status="online",KBS World (720p)
https://kbsworld-ott.akamaized.net/hls/live/2002341/kbsworld/master.m3u8
#EXTINF:-1 tvg-id="KBSWorld.kr" status="online",KBS World (Vietnamese Subtitles) (720p)
https://livecdn.fptplay.net/sdb/kbs_hls.smil/playlist.m3u8
#EXTINF:-1 tvg-id="KBSWorld.kr" status="online",KBS World (720p)
https://wms4-kortv.akamaized.net/a_live/63719963/smil:20ch011.smil/playlist.m3u8
#EXTINF:-1 tvg-id="KBSWorld.kr" status="online",KBS World (Vietnamese Subtitles) (720p)
@ -97,13 +95,13 @@ https://livecdn.fptplay.net/sdb/kbs_hls.smil/playlist.m3u8
http://119.77.96.184:1935/chn05/chn05/playlist.m3u8
#EXTINF:-1 tvg-id="KNNTV.kr" status="online",SBS KNN (450p) [Not 24/7]
http://211.220.195.200:1935/live/mp4:KnnTV.sdp/playlist.m3u8
#EXTINF:-1 tvg-id="KPlus.sg" status="error",K+ (Indonesian subtitle) (576p) [Geo-blocked]
#EXTINF:-1 tvg-id="KPlus.sg" status="online",K+ (Indonesian subtitle) (576p) [Geo-blocked]
http://210.210.155.35/uq2663/h/h08/index.m3u8
#EXTINF:-1 tvg-id="KPlus.sg" status="error",K+ (Indonesian subtitle) (576p)
http://210.210.155.37/uq2663/h/h08/index.m3u8
#EXTINF:-1 tvg-id="KShopping.kr" status="online",KShopping
https://fhs8036.bd-61.ktcdn.co.kr/klive/smil:klive.smil/playlist.m3u8
#EXTINF:-1 tvg-id="MBCTV.kr" status="error",MBC (1080p)
#EXTINF:-1 tvg-id="MBCTV.kr" status="online",MBC (1080p)
http://123.254.72.24:1935/tvlive/livestream2/playlist.m3u8
#EXTINF:-1,MBC Mokpo 720p
http://vod.mpmbc.co.kr:1935/live/encoder-tv/playlist.m3u8
@ -121,7 +119,7 @@ http://210.210.155.35/dr9445/h/h20/index.m3u8
http://210.210.155.37/dr9445/h/h20/index.m3u8
#EXTINF:-1 tvg-id="TVNMovies.hk" status="online",tvN Movies (Indonesian Subtitle) (576p) [Geo-blocked]
http://210.210.155.35/dr9445/h/h21/index.m3u8
#EXTINF:-1 tvg-id="TVNMovies.hk" status="error",tvN Movies (Indonesian Subtitle) (576p)
#EXTINF:-1 tvg-id="TVNMovies.hk" status="online",tvN Movies (Indonesian Subtitle) (576p)
http://210.210.155.37/dr9445/h/h21/index.m3u8
#EXTINF:-1 tvg-id="TVWorkNet.kr" status="online",TVWorkNet (480p)
http://live.worktv.or.kr:1935/live/wowtvlive1.sdp/playlist.m3u8