Fix merge conflict

This commit is contained in:
Alsturit 2022-08-28 09:50:42 -05:00
parent 77477ee453
commit cf4ec53ab5
No known key found for this signature in database
GPG Key ID: 4F57E6793C946CEC
1 changed files with 0 additions and 2 deletions

View File

@ -281,8 +281,6 @@ https://amdlive-ch03-ctnd-com.akamaized.net/arirang_3ch/smil:arirang_3ch.smil/pl
http://live.kytv.co.kr:8080/hls/stream.m3u8
#EXTINF:-1 tvg-id="" status="timeout",All The K-POP
http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/c/ALLTHEKPOP/live
#EXTINF:-1 tvg-id="" status="timeout",Korean Song Channel
http://live.kytv.co.kr:8080/hls/stream.m3u8
#EXTINF:-1 tvg-id="SPOTV.kr" status="",SPOTV1 (404p)
https://apichvod19.seezntv.com/OTM/10070_L.m3u8?AdaptiveType=HLS&SessionID=3438d7e9-3e70-43b1-9fe6-b8290cd25403
#EXTINF:-1 tvg-id="SPOTV.kr" status="",SPOTV1 (720p)