Fix git merge

This commit is contained in:
Allan Fernando 2021-09-23 02:38:59 -03:00
parent 34859be0c3
commit c471ce445d
1 changed files with 4 additions and 2 deletions

View File

@ -124,9 +124,9 @@ https://59f2354c05961.streamlock.net:1443/tvdigitalbirigui/tvdigitalbirigui/play
http://tv02.logicahost.com.br:1935/bonner/bonner/live.m3u8
#EXTINF:-1 tvg-id="TVBrasil.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://upload.wikimedia.org/wikipedia/pt/1/1c/Logotipo_da_TV_Brasil.png" group-title="General",TV Brasil [Offline]
https://edge-df-01.eduplay.rnp.br/media/ocp(r(iRGrcw)t(AAAAAAAAAAA)p(d(Dxg)k(Qdk)m(naXbjbTlDxrHlrlxKSNzig)n(a(3LDBWxJLACwHVOavx5cO4BC5lA2ZDpPC)s(HrY)'a(12ztgSdgu3rQqz6xH52ZjVZa)s(Pm8)))s(t(aTo)b(PTsuEXhXAScNjp6w9ssG70foQQQiZk9_8m0vsjgLJ_yzxGPuj8i57PEDMMA4cmTNsKda2B5oX-EEErouZ1HFyuG_AaUF86vlMJtsMkooySBOlQbVM33PgsYPQdea2BJafjjc-BWtPRlStfmQ939PXcd844pid2JY82J6JDM)'t(S2o)b(WaBWYarWoWCInKe38WSze3Q_-kYcqZf8MZQ)))/index.m3u8
#EXTINF:-1 tvg-id="TVcamara.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/UpV2PRk.png" group-title="Legislative",TV Câmara (1080p)
#EXTINF:-1 tvg-id="TVCamara.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/UpV2PRk.png" group-title="Legislative",TV Câmara (1080p)
https://stream3.camara.gov.br/tv1/manifest.m3u8
#EXTINF:-1 tvg-id="TVcamara2.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/UpV2PRk.png" group-title="Legislative",TV Câmara 2 (1080p)
#EXTINF:-1 tvg-id="TVCamara2.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/UpV2PRk.png" group-title="Legislative",TV Câmara 2 (1080p)
https://stream3.camara.gov.br/tv2/manifest.m3u8
#EXTINF:-1 tvg-id="saopaulo.sp.leg.br" tvg-country="BR" tvg-language="Portuguese" tvg-logo="https://i.imgur.com/e8zZuyq.jpg" group-title="Legislative",TV Camara de Sao Paulo (720p)
https://cdn.jmvstream.com/w/LVW-8711/ngrp:LVW8711_tG0F3TEBDL_all/playlist.m3u8
@ -216,6 +216,8 @@ https://5e837408ea907.streamlock.net:1936/tvpantanalms/tvpantanalms/playlist.m3u
http://200.189.113.201/hls/tve.m3u8
#EXTINF:-1 tvg-id="TVPocos.br" tvg-country="BR" tvg-language="" tvg-logo="" group-title="",TV Poços (192p) [Not 24/7]
http://rtmp.cdn.upx.net.br/00084/myStream.sdp/playlist.m3u8
#EXTINF:-1 tvg-id="TVPombal.br" tvg-country="BR" tvg-language="" tvg-logo="http://www.m3u.cl/logo/109869_TV_Pombal.png" group-title="",TV Pombal (486p) [Not 24/7]
https://server.flixtv.com.br/agrobrasiltv/agrobrasiltv/playlist.m3u8
#EXTINF:-1 tvg-id="TVSantaCruz.br" tvg-country="BR" tvg-language="" tvg-logo="https://www.tvsantacruzcr.net/img/logotvsc.png" group-title="",TV Santa Cruz (720p)
https://rtmp.info/tvsantacruz/envivo/chunks.m3u8
#EXTINF:-1 tvg-id="TVSERIES.br" tvg-country="BR" tvg-language="" tvg-logo="https://image.winudf.com/v2/image/Y29tLnR2c2VyaWVzLmdyYXRpc19zY3JlZW5fMF8xNTEzODc0NTE1XzA2OA/screen-0.jpg?fakeurl=1&type=.jpg" group-title="",TV SERIES (480p)