From cf4ec53ab5dda6eb896001bb148a1e06e2967b01 Mon Sep 17 00:00:00 2001 From: Alsturit Date: Sun, 28 Aug 2022 09:50:42 -0500 Subject: [PATCH] Fix merge conflict --- streams/kr.m3u | 2 -- 1 file changed, 2 deletions(-) diff --git a/streams/kr.m3u b/streams/kr.m3u index f293ceed0..70c223f97 100644 --- a/streams/kr.m3u +++ b/streams/kr.m3u @@ -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)