mirror of
https://github.com/iptv-org/iptv
synced 2026-11-17 22:54:36 -05:00
Resolve merge conflict
This commit is contained in:
commit
d4b3ef76bb
87 files changed
+947
-1149
No files matched your search
@@ -257,8 +257,6 @@ http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/c/newsk
|
||||
http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/user/TheArteTV/live
|
||||
#EXTINF:-1 tvg-id="" status="online",JCN TV
|
||||
https://jcnonair-1108.acs.wecandeo.com/ms/3162/1108/index.m3u8
|
||||
#EXTINF:-1 tvg-id="" status="error",KBS News
|
||||
http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/c/newskbs/live
|
||||
#EXTINF:-1 tvg-id="" status="online",GoodTV (1080p)
|
||||
http://mobliestream.c3tv.com:1935/live/goodtv.sdp/playlist.m3u8
|
||||
#EXTINF:-1 tvg-id="" status="online",SPOTV (1080p)
|
||||
|
||||
Reference in new issue
Block a user