From 68d6ea90b945883b3a5e2d67fc60efe77dd23cc7 Mon Sep 17 00:00:00 2001 From: Aleksandr Statciuk Date: Wed, 8 Sep 2021 07:59:14 +0300 Subject: [PATCH] Update cn.m3u --- channels/cn.m3u | 4 ---- 1 file changed, 4 deletions(-) diff --git a/channels/cn.m3u b/channels/cn.m3u index a3b8f4a71..e3567e157 100644 --- a/channels/cn.m3u +++ b/channels/cn.m3u @@ -393,11 +393,7 @@ http://112.17.40.140/PLTV/88888888/224/3221226186/index.m3u8 http://v.btzx.com.cn:1935/live/weishi.stream/playlist.m3u8 #EXTINF:-1 tvg-id="BingTuanJianShe.cn" tvg-name="兵团建设" tvg-country="CN" tvg-language="Chinese" tvg-logo="http://www.tvyan.com/uploads/dianshi/bingtuantv.jpg" group-title="",兵团建设 News (360p) http://v.btzx.com.cn:1935/live/news.stream/playlist.m3u8 -<<<<<<< HEAD #EXTINF:-1 tvg-id="NeiMengGuWeiShi.cn" tvg-name="内蒙古卫视" tvg-country="CN" tvg-language="Chinese" tvg-logo="http://epg.51zmt.top:8000/tb1/ws/neimeng.png" group-title="",内蒙古卫视 (576p) -======= -#EXTINF:-1 tvg-id="NeiMengGuWeiShi.cn" tvg-name="内蒙古卫视" tvg-country="CN" tvg-language="Chinese" tvg-logo="http://epg.51zmt.top:8000/tb1/ws/neimeng.png" group-title="",内蒙古卫视 ->>>>>>> parent of 78377f653 (Update cn.m3u) http://117.169.120.140:8080/live/neimenggustv/.m3u8 #EXTINF:-1 tvg-id="NeiMengGuWeiShi.cn" tvg-name="内蒙古卫视" tvg-country="CN" tvg-language="Chinese" tvg-logo="http://epg.51zmt.top:8000/tb1/ws/neimeng.png" group-title="",内蒙古卫视 (1080p) http://live.m2oplus.nmtv.cn/1/playlist.m3u8