Git conflict solved

This commit is contained in:
Diego 2021-02-06 12:22:45 -05:00
parent a0f708d511
commit 00b5fc2768
1 changed files with 1 additions and 1 deletions

View File

@ -589,7 +589,7 @@
| La Tele Tuya Venezuela | [m3u8](https://vcp.myplaytv.com/tlthd/tlthd/playlist.m3u8) | [web](https://lateletuya.com/) | [logo](https://graph.facebook.com/LaTeleTuya/picture?width=200&height=200) | - | - |
| 24h Chile | [youtube](https://www.youtube.com/channel/UCTXNz3gjAypWp3EhlIATEJQ/live) | [web](https://www.24horas.cl/envivo/) | [logo](https://graph.facebook.com/24horas.cl/picture?width=200&height=200) | - | EMB |
| TELE13 Chile | [youtube](https://www.youtube.com/channel/UCsRnhjcUCR78Q3Ud6OXCTNg/live) | [web](https://www.t13.cl/en-vivo) | [logo](https://graph.facebook.com/teletrece/picture?width=200&height=200) | - | EMB |
| TV Senado Chile | [youtube](https://www.youtube.com/channel/UC4GJ43VNn4AYfiYa0RBCHQg/live) | [web](https://tv.senado.cl/) | [logo](https://yt3.ggpht.com/ytc/AAUvwngo1_R3qsOhHx2XSi5C30pMzQxKoLx1_FyUQvjnxQ=s88-c-k-c0x00ffffff-no-rj) | - | EMB |
| TV Senado Chile | [youtube](https://www.youtube.com/channel/UC4GJ43VNn4AYfiYa0RBCHQg/live) | [web](https://tv.senado.cl/) | [logo](https://pbs.twimg.com/profile_images/1212139271865479168/_Pxi-Oou_200x200.jpg) | - | EMB |
| TC TV Ecuador | [m3u8](https://mdstrm.com/live-stream-playlist/5fdd14e2ae4dcc06ebf7546e.m3u8) | [web](https://www.tctelevision.com/en-vivo) | [logo](https://graph.facebook.com/tctelevision10/picture?width=200&height=200) | - | - |
| TeleAmazonas Ecuador | [m3u8](https://api.new.livestream.com/accounts/1359588/events/4428723/live.m3u8) | [web](http://www.teleamazonas.com/teleamazonas-en-vivo/) | [logo](https://graph.facebook.com/TeleamazonasEcuador/picture?width=200&height=200) | - | - |
| Bolivia 7.1 TV | - | [web](http://www.boliviatv.bo/principal/tvenvivo71.php) | [logo](https://graph.facebook.com/BoliviatvOficial/picture?width=200&height=200) | - | W3U,EXTA |