diff --git a/channels/ar.m3u b/channels/ar.m3u index 11b48c70eb..b38882c04e 100644 --- a/channels/ar.m3u +++ b/channels/ar.m3u @@ -63,13 +63,9 @@ http://186.0.233.76:1935/Garage/smil:garage.smil/master.m3u8 http://streaming02.arcast.com.ar:1935/la90fm/la90fm/playlist.m3u8 #EXTINF:-1 tvg-id="" tvg-name="" tvg-language="Spanish" tvg-logo="https://i.imgur.com/LHtd9oT.png" group-title="",Multivision Argentina http://panel.dattalive.com:1935/8250/8250/.m3u8 -<<<<<<< HEAD -#EXTINF:-1 tvg-id="" tvg-name="" tvg-language="Spanish" tvg-logo="https://i.imgur.com/dKpLbh6.png" group-title="Music",Music Top -======= #EXTINF:-1 tvg-id="" tvg-name="" tvg-language="Spanish" tvg-logo="" group-title="",Multivisión http://panel.dattalive.com:1935/8250/8250/chunklist_w2099432844.m3u8 -#EXTINF:-1 tvg-id="" tvg-name="" tvg-language="Spanish" tvg-logo="https://i.imgur.com/dKpLbh6.png" group-title="Music",Music Top (Adaptive) ->>>>>>> d5a680156a1edfcb7e12489ef290e653deba9b5e +#EXTINF:-1 tvg-id="" tvg-name="" tvg-language="Spanish" tvg-logo="https://i.imgur.com/dKpLbh6.png" group-title="Music",Music Top https://live-edge01.telecentro.net.ar/live/smil:musictop.smil/playlist.m3u8 #EXTINF:-1 tvg-id="" tvg-name="" tvg-language="Spanish" tvg-logo="https://i.imgur.com/dKpLbh6.png" group-title="Music",Music Top http://live-edge01.telecentro.net.ar:1935/live/msctphd-720/playlist.m3u8 @@ -93,10 +89,3 @@ https://live-edge01.telecentro.net.ar/live/smil:tlx.smil/master.m3u8 http://streamspub.manasat.com:1935/tvar/tvmanaar2/playlist.m3u8 #EXTINF:-1 tvg-id="" tvg-name="" tvg-language="Spanish" tvg-logo="" group-title="",Télam 4 http://184.154.28.210:1935/canal4/canal4/playlist.m3u8 -<<<<<<< HEAD -#EXTINF:-1 tvg-id="" tvg-name="" tvg-language="Spanish" tvg-logo="" group-title="",NET TV -https://unlimited6-us.dps.live/nettv/nettv.smil/nettv/livestream2/chunks.m3u8 -#EXTINF:-1 tvg-id="" tvg-name="" tvg-language="Spanish" tvg-logo="" group-title="",Multivisión -http://panel.dattalive.com:1935/8250/8250/chunklist_w2099432844.m3u8 -======= ->>>>>>> d5a680156a1edfcb7e12489ef290e653deba9b5e