Resolve conflict

This commit is contained in:
Alsturit
2022-08-17 04:45:11 -05:00
82 changed files with 1203 additions and 1209 deletions

View File

@@ -33,7 +33,7 @@ https://59ce1298bfb98.streamlock.net/motorsur/motorsur/playlist.m3u8
http://170.83.242.153:8000/play/a024
#EXTINF:-1 tvg-id="ObediraTV.py" status="online",Obedira TV
https://59ce1298bfb98.streamlock.net/obediratv/obediratv/playlist.m3u8
#EXTINF:-1 tvg-id="OviedoTV.py" status="online",Oviedo TV
#EXTINF:-1 tvg-id="OviedoTV.py" status="error",Oviedo TV
https://59ce1298bfb98.streamlock.net/oviedotv/oviedotv/playlist.m3u8
#EXTINF:-1 tvg-id="Paravision.py" status="error",Paravision (480p)
http://170.83.242.153:8000/play/a021
@@ -59,7 +59,7 @@ http://170.83.242.153:8000/play/a03e
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]
#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