Merge conflict

This commit is contained in:
Alsturit
2022-08-16 11:23:58 -05:00
91 changed files with 1296 additions and 1296 deletions

View File

@@ -13,7 +13,7 @@ https://rds3.desdeparaguay.net/dismartv/dismartv/playlist.m3u8
https://59ce1298bfb98.streamlock.net/educanal/educanal/playlist.m3u8
#EXTINF:-1 tvg-id="EmprendeTV.py" status="error",EmprendeTV
https://59ce1298bfb98.streamlock.net/emprendetv/emprendetv/playlist.m3u8
#EXTINF:-1 tvg-id="EstacionCristal.py" status="error",Estación Cristal
#EXTINF:-1 tvg-id="EstacionCristal.py" status="online",Estación Cristal
https://59ce1298bfb98.streamlock.net/cristaltv/cristaltv/playlist.m3u8
#EXTINF:-1 tvg-id="FarraPlay.py" status="online",Farra Play (720p) [Not 24/7]
http://159.203.148.226/live/farra.m3u8
@@ -47,7 +47,7 @@ https://59ce1298bfb98.streamlock.net/mediosenpy/mediosenpy/playlist.m3u8
https://59ce1298bfb98.streamlock.net/tvsenadopy/tvsenadopy/playlist.m3u8
#EXTINF:-1 tvg-id="SNT.py" status="online",SNT (480p)
https://d4xunn272arip.cloudfront.net/hls/snt.m3u8
#EXTINF:-1 tvg-id="SomosdelEste.py" status="error",Somos Del Este
#EXTINF:-1 tvg-id="SomosdelEste.py" status="online",Somos Del Este
https://59ce1298bfb98.streamlock.net/somosdeleste/somosdeleste/playlist.m3u8
#EXTINF:-1 tvg-id="SucesoTV.py" status="online",Suceso TV
https://59ce1298bfb98.streamlock.net/sucesotv/sucesotv/playlist.m3u8
@@ -60,9 +60,9 @@ https://stream.rpc.com.py/live/trece.m3u8
#EXTINF:-1 tvg-id="TVAire.py" status="online",TV Aire
https://59ce1298bfb98.streamlock.net/tvaire/tvaire/playlist.m3u8
#EXTINF:-1 tvg-id="Unicanal.py" status="online",Unicanal (720p) [Not 24/7]
http://unicanal.com.py/live/unicanal.m3u8
#EXTINF:-1 tvg-id="Unicanal.py" status="error",Unicanal (720p) [Not 24/7]
http://45.55.127.106/live/unicanal_mid.m3u8
#EXTINF:-1 tvg-id="Unicanal.py" status="error",Unicanal (720p) [Not 24/7]
http://unicanal.com.py/live/unicanal.m3u8
#EXTINF:-1 tvg-id="Uniradio.py" status="online",Uniradio
https://59ce1298bfb98.streamlock.net/uniradiotv/uniradiotv/playlist.m3u8
#EXTINF:-1 tvg-id="VenusMedia.py" status="",Venus Media (480p)