Merge remote-tracking branch 'origin/master'

This commit is contained in:
Timotej Kusy 2022-02-27 22:01:34 +01:00
commit 0430fdba91

View file

@ -19028,7 +19028,11 @@ RTVRwanda.rw,RTV Rwanda,,RW,,,c/RW,kin,,FALSE,,https://i.imgur.com/nGNMiUE.png
RTVS1.sk,RTVS 1,,SK,,,c/SK,slk,,FALSE,http://www.rtvs.sk/televizia/tv,https://www.sms.cz/kategorie/televize/bmp/loga/velka/STV1.png RTVS1.sk,RTVS 1,,SK,,,c/SK,slk,,FALSE,http://www.rtvs.sk/televizia/tv,https://www.sms.cz/kategorie/televize/bmp/loga/velka/STV1.png
RTVS2.sk,RTVS 2,,SK,,,c/SK,slk,,FALSE,http://www.rtvs.sk/televizia/tv,https://www.sms.cz/kategorie/televize/bmp/loga/velka/STV2.png RTVS2.sk,RTVS 2,,SK,,,c/SK,slk,,FALSE,http://www.rtvs.sk/televizia/tv,https://www.sms.cz/kategorie/televize/bmp/loga/velka/STV2.png
RTVS3.sk,RTVS 3,,SK,,,c/SK,slk,,FALSE,http://www.rtvs.sk/televizia/tv,https://www.sms.cz/kategorie/televize/bmp/loga/velka/trojka.png RTVS3.sk,RTVS 3,,SK,,,c/SK,slk,,FALSE,http://www.rtvs.sk/televizia/tv,https://www.sms.cz/kategorie/televize/bmp/loga/velka/trojka.png
<<<<<<< HEAD
RTVSSport.sk,RTVS Sport,,SK,,,c/SK,slk,,FALSE,http://www.rtvs.sk/televizia/tv,https://www.sms.cz/kategorie/televize/bmp/loga/velka/rtvs_sport.png RTVSSport.sk,RTVS Sport,,SK,,,c/SK,slk,,FALSE,http://www.rtvs.sk/televizia/tv,https://www.sms.cz/kategorie/televize/bmp/loga/velka/rtvs_sport.png
=======
RTVSSport.sk,RTVS Šport,,SK,,,c/SK,slk,,FALSE,http://www.rtvs.sk/televizia/tv,https://www.sms.cz/kategorie/televize/bmp/loga/velka/rtvs_sport.png
>>>>>>> master
RTVSanMarino.sm,RTV San Marino,,SM,,,c/SM,ita,,FALSE,, RTVSanMarino.sm,RTV San Marino,,SM,,,c/SM,ita,,FALSE,,
RTVSCAN.al,RTV SCAN,,AL,,,c/AL,sqi,,FALSE,, RTVSCAN.al,RTV SCAN,,AL,,,c/AL,sqi,,FALSE,,
RTVScheldemond.nl,RTV Scheldemond,,NL,,,c/NL,nld,,FALSE,,https://live-delta.ottnow.stoneroos.com/image/logo/tv.delta.nl/assets/graphics/thumbnails/operatorChannel/1/channel_68_1_5dbaaeacd061c6.91487181.svg RTVScheldemond.nl,RTV Scheldemond,,NL,,,c/NL,nld,,FALSE,,https://live-delta.ottnow.stoneroos.com/image/logo/tv.delta.nl/assets/graphics/thumbnails/operatorChannel/1/channel_68_1_5dbaaeacd061c6.91487181.svg

Can't render this file because it is too large.