Resolve merge conflict

This commit is contained in:
Alsturit 2022-08-28 09:30:07 -05:00
parent 2397c55766
commit c8f5bc8f0d
No known key found for this signature in database
GPG Key ID: 4F57E6793C946CEC
1 changed files with 6 additions and 2 deletions

View File

@ -7,7 +7,7 @@ https://allanf181.github.io/adaptive-streams/streams/kr/AnimaxKorea.m3u8
https://allanf181.github.io/adaptive-streams/streams/kr/Anione.m3u8
#EXTINF:-1 tvg-id="Aniplus.kr" status="online",Aniplus (1080p) [Not 24/7]
https://allanf181.github.io/adaptive-streams/streams/kr/Aniplus.m3u8
#EXTINF:-1 tvg-id="AniplusAsia.sg" status="online",Aniplus (Indonesian subtitle) (576p) [Geo-blocked]
#EXTINF:-1 tvg-id="AniplusAsia.sg" status="error",Aniplus (Indonesian subtitle) (576p) [Geo-blocked]
http://210.210.155.35/dr9445/h/h02/index.m3u8
#EXTINF:-1 tvg-id="AniplusAsia.sg" status="error",Aniplus (Indonesian subtitle) (576p) [Geo-blocked]
http://210.210.155.37/dr9445/h/h02/index.m3u8
@ -221,7 +221,7 @@ https://allanf181.github.io/adaptive-streams/streams/kr/Tooniverse.m3u8
https://allanf181.github.io/adaptive-streams/streams/kr/TVChosun.m3u8
#EXTINF:-1 tvg-id="tvN.kr" status="online",tvN (1080p) [Not 24/7]
https://allanf181.github.io/adaptive-streams/streams/kr/tvN.m3u8
#EXTINF:-1 tvg-id="TVNAsia.hk" status="error",tvN Asia (Indonesian Subtitle) (576p)
#EXTINF:-1 tvg-id="TVNAsia.hk" status="online",tvN Asia (Indonesian Subtitle) (576p)
http://210.210.155.37/dr9445/h/h20/index.m3u8
#EXTINF:-1 tvg-id="tvNDrama.kr" status="online",tvN DRAMA (1080p) [Not 24/7]
https://allanf181.github.io/adaptive-streams/streams/kr/tvNDrama.m3u8
@ -251,6 +251,8 @@ http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel
http://slive.sciencetv.kr:1935/science/yslive_20140419_1/playlist.m3u8
#EXTINF:-1 tvg-id="" status="online",Korea TV
https://hlive.ktv.go.kr/live/klive_h.stream/playlist.m3u8
#EXTINF:-1 tvg-id="" status="online",KBS News
http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/c/newskbs/live
#EXTINF:-1 tvg-id="" status="online",arteTV
http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/user/TheArteTV/live
#EXTINF:-1 tvg-id="" status="online",JCN TV
@ -277,6 +279,8 @@ https://amdlive-ch01-ctnd-com.akamaized.net/arirang_3ch/smil:arirang_3ch.smil/pl
https://amdlive-ch02-ctnd-com.akamaized.net/arirang_3ch/smil:arirang_3ch.smil/playlist.m3u8
#EXTINF:-1 tvg-id="" status="online",Arirang Radio (720p)
https://amdlive-ch03-ctnd-com.akamaized.net/arirang_3ch/smil:arirang_3ch.smil/playlist.m3u8
#EXTINF:-1 tvg-id="" status="online",Korean Song Channel
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