Merge branch 'master' of https://github.com/AntiPontifex/database

data/channels.csv

@@ -976,10 +976,7 @@ AlassemaTV.eg,Alassema TV,,,,EG,,,c/EG,ara,religious,FALSE,,,,,https://i.imgur.c
 AlaToo24.kg,Ala-Too 24,Ала-Тоо 24;УТРК Ала-Тоо 24;КТРК Ала-Тоо 24,,National Broadcasting Corporation of the Kyrgyz Republic,KG,,Bishkek,r/CAS,kir;rus,news,FALSE,2016-09-12,,,https://www.utrk.kg/kg/live/tv?channel=42,https://i.imgur.com/vBPmUQA.png
 Alaune.fr,A la une,,,Vivendi,FR,,Issy-les-Moulineaux,c/FR,fra,entertainment,FALSE,1984-11-04,,,http://www.canalsat.fr/,https://i.imgur.com/mfsb0zf.png
 AlauTV.kz,Alau TV,,,,KZ,,Kostanay,c/KZ,kaz,,FALSE,,,,,https://i.imgur.com/gK6ZRzp.png
-<<<<<<< HEAD
-=======
 AlawlaTV.iq,Alawla TV,قناة الاولى العراقية,,,IQ,,Baghdad,c/IQ,ara,general,FALSE,2023-04-01,,,https://alawla.tv/live.html,https://i.ytimg.com/vi/ojAKgy0fZPE/hqdefault.jpg
->>>>>>> 67571e733e477c7af6ecc0bd1a584ab1f6a23399
 AlAyyamTV.iq,Al Ayyam TV,,,,IQ,,,c/IQ,ara,,FALSE,,,,,https://www.lyngsat.com/logo/tv/aa/al-ayam-tv.png
 AlbaCarolinaTV.ro,Alba Carolina TV,Carolina TV,,,RO,,Alba Iulia,c/RO,ron,general,FALSE,,,,https://www.carolinatv.ro/,https://i.imgur.com/RyOsV0g.png
 AlBaghdadia1.iq,Al-Baghdadia 1,البغدادية 1,,Awn Hussain Al Khashlok,IQ,,,c/IQ,ara,news,FALSE,2005-09-12,,,https://albaghdadiatv.com/,https://i.imgur.com/cI8uw7D.png
@@ -1138,21 +1135,14 @@ AllahdhahTV.ye,Allahdhah TV,,,,YE,,,c/YE,ara,,FALSE,,,,,https://i.imgur.com/v9VO
 AllAnal.ca,AllAnal,,,KB Productions LLC,CA,CA-ON,Toronto,c/CA,eng,xxx,TRUE,,,,https://tour.allanal.com/,https://i.imgur.com/5SaXxGw.png
 AllAnalAllTheTime.us,All Anal All The Time,,,,US,,,c/US,eng,xxx,TRUE,,,,https://www.allanalallthetime.com/,https://i.imgur.com/3mrG9GT.png
 ALLBLKGems.us,ALLBLK Gems,,,RLJ Entertainment Inc,US,US-CA,Woodland Hills,c/US,eng,entertainment,FALSE,2014-11-01,,,https://allblk.tv/,https://i.imgur.com/gnkepQJ.png
-<<<<<<< HEAD
-=======
 AllegroHD.ar,Allegro HD,,,Grupo Eurochannel,AR,,Buenos Aires,c/AR;r/LATAM,spa,music,FALSE,,,,https://allegrohd.com/,https://i.imgur.com/bRH34Rn.png
->>>>>>> 67571e733e477c7af6ecc0bd1a584ab1f6a23399
 AllegroWebTV.br,Allegro WebTV,,,,BR,BR-MG,Diamantina,s/BR-MG,por,general,FALSE,,,,https://allegrowebtv.com.br/,https://i.imgur.com/7iSmccE.png
 AllEliteWrestling.us,All Elite Wrestling,,,Tony Khan,US,US-FL,Jacksonville,c/US,spa,sports,FALSE,2019-01-01,,,https://www.allelitewrestling.com/,https://i.imgur.com/5YO1phG.png
 AlleluiaWorldTV.bj,Alleluia World TV,Alléluia World TV,,,BJ,,Cotonou,c/BJ,fra,religious,FALSE,,,,,https://www.lyngsat.com/logo/tv/aa/alleluia_world_tv.png
 AllenCityTV.us,Allen City TV,ACTV,,,US,US-TX,Allen,s/US-TX,eng,general,FALSE,,,,https://actv.org/CablecastPublicSite/watch-now?site=1,https://i.imgur.com/tX18djm.png
 AllendeTV.mx,Allende TV,,,Jesús Aranday Quiroz,MX,MX-DUR,Ignacio Allende,c/MX,spa,general,FALSE,,,,,https://i.imgur.com/6UyR11Y.jpg
-<<<<<<< HEAD
-AllgauTV.de,Allgau TV,Allgäu TV,,,DE,,Kempten,c/DE,deu,general,FALSE,,,,https://www.allgäu.tv/,https://upload.wikimedia.org/wikipedia/commons/thumb/8/8e/Allg%C3%A4u_TV_Logo_%282021%29.svg/512px-Allg%C3%A4u_TV_Logo_%282021%29.svg.png
-=======
 AllgauTV.de,Allgau TV,Allgäu TV,,,DE,,Kempten,c/DE,deu,general,FALSE,,,,https://www.xn--allgu-jra.tv/,https://upload.wikimedia.org/wikipedia/commons/thumb/8/8e/Allg%C3%A4u_TV_Logo_%282021%29.svg/512px-Allg%C3%A4u_TV_Logo_%282021%29.svg.png
 AllPlayEnt.id,All Play Ent,Usee Prime;AllPlay Ent,,,ID,,,c/ID,ind,,FALSE,,,UseePrime.id,https://www.indihometv.com/,https://i.postimg.cc/K8yShFYn/1200px-All-Play-Entertainment.png
->>>>>>> 67571e733e477c7af6ecc0bd1a584ab1f6a23399
 AllRealitybyWEtv.us,All Reality by WE tv,,Pluto TV,,US,,,c/US,eng,series,FALSE,,,,https://pluto.tv/en/live-tv/all-reality-by-we-tv,https://i.imgur.com/HZTz5HJ.png
 AllSports.br,All Sports,,,,BR,,,c/BR,por,sports,FALSE,,,,,https://i.imgur.com/wULpnYR.png
 AllSportsTVNetwork.us,All Sports TV Network,,,,US,US-CA,Glendale,c/US,eng,sports,FALSE,,,,https://www.all-sportstv.net/,https://i.imgur.com/qHwCima.jpg
@@ -1203,10 +1193,7 @@ AlNadaTV.eg,Al Nada TV,,,,EG,,Giza,c/EG,ara,,FALSE,,,,http://alnada.tv/,https://
 AlNaeemTV.iq,Al-Naeem TV,قناة النعيم,,,IQ,,Basra,c/IQ,ara,,FALSE,,,,https://www.alnaeem-tv.iq/,https://i.imgur.com/JyWjfIB.png
 AlNahar.eg,Al-Nahar,النهار,,Trenta for Art Production and Distribution,EG,,Cairo,c/EG,ara,general,FALSE,2011-06-30,,,https://www.al-nahar.tv/,https://upload.wikimedia.org/wikipedia/commons/thumb/6/62/AL_NAHAR_TV_NEW_LOGO.png/512px-AL_NAHAR_TV_NEW_LOGO.png
 AlNaharDrama.eg,Al-Nahar Drama,النهار دراما,,Trenta for Art Production and Distribution,EG,,Cairo,c/EG,ara,series,FALSE,2011-08-01,,,https://www.al-nahar.tv/,https://i.imgur.com/ieckdoE.png
-<<<<<<< HEAD
-=======
 AlNaharNoor.eg,Al-Nahar Noor,,,,EG,,,c/EG,ara,religious,FALSE,,,,,https://i.imgur.com/rTnL8EE.png
->>>>>>> 67571e733e477c7af6ecc0bd1a584ab1f6a23399
 AlNajahNews.ps,Al Najah News,النجاح الإخباري,,,PS,,Nablus,c/PS,ara,news,FALSE,,,,https://nn.najah.edu,https://i.imgur.com/c2bwn4G.png
 AlNassrTV.td,Al Nassr TV,,,,TD,,,c/TD,fra,,FALSE,,,,,https://i.imgur.com/DnYXwsr.png
 AlNassrTV24.td,Al Nassr TV 24,,,,TD,,,c/TD,fra,news,FALSE,,,,,https://i.imgur.com/CaizvLC.png
@@ -1539,10 +1526,7 @@ AniplusAsia.sg,Aniplus Asia,,Aniplus,Plus Media Networks Asia,SG,,Singapore,r/SE
 AnixeHDSerie.de,Anixe HD Serie,,,Anixe HD Television GmbH ,DE,,Munich,c/DE,deu,entertainment,FALSE,,,,http://www.anixehd.tv/index.php?hdsd=HD,https://upload.wikimedia.org/wikipedia/commons/thumb/c/c0/Anixe_HD.svg/512px-Anixe_HD.svg.png
 AnixePlus.de,Anixe +,,,Anixe HD Television GmbH ,DE,,Munich,c/DE,deu,entertainment,FALSE,,,,http://www.anixehd.tv/index.php?hdsd=SD,https://i.imgur.com/hvGJ2oa.png
 AnjanTV.in,Anjan TV,,,,IN,,New Delhi,c/IN,hin,entertainment,FALSE,,,,https://www.anjan.tv/,https://i.imgur.com/sh0yFSf.png
-<<<<<<< HEAD
-=======
 AnkyunPlus3TV.am,Ankyun+3 TV,,,,AM,,Alaverdi,c/AM,hye,general,FALSE,,,,https://ankyun3news.com/,https://i.imgur.com/UNkjhtg.jpg
->>>>>>> 67571e733e477c7af6ecc0bd1a584ab1f6a23399
 ANN.sy,ANN,,,Siwar al Assad,SY,,London,c/SY,ara,news,FALSE,1997-01-01,,,https://anntv.co.uk/,https://www.freeetv.com/images/01_logo/arab_news_network.jpg
 AnNinhTheGioi.vn,An Ninh The Gioi,An Ninh Thế Giới,,HCATV,VN,,,c/VN,vie,,FALSE,2009-10-28,,,https://antg.cand.com.vn/,https://i.imgur.com/H1JjQWs.png
 AnNinhTV.vn,An Ninh TV,ANTV,,Ministry of Public Security of Vietnam,VN,,,c/VN,vie,,FALSE,2011-12-01,,,https://www.antv.gov.vn/,https://i.postimg.cc/ht0CqCBy/ANTV-logo-2016.png
@@ -1632,10 +1616,7 @@ APlusV.uy,A+V,,,,UY,,Montevideo,c/UY,spa,culture,FALSE,,,,http://www.amasv.com.u
 APN.in,APN,,,,IN,,Delhi,c/IN,hin,news,FALSE,,,,https://www.apnlive.com/,https://i.imgur.com/RhkbhZD.png
 ApnaChannel.pk,Apna Channel,اپنا چینل,,Ahmed Hussain,PK,,Karachi,c/PK,urd;eng,general,FALSE,2004-10-14,,,http://apna.tv/,https://i.imgur.com/ICSA4W6.png
 ApnaPunjabTV.ca,Apna Punjab TV,,,,CA,CA-ON,Brampton,c/IN,hin,entertainment,FALSE,,,,https://www.apnapunjab.tv/,https://i.imgur.com/IM4D8Wz.png
-<<<<<<< HEAD
-=======
 ApnaTV.nz,Apna TV,,,,NZ,,Auckland,c/NZ,eng;hin,culture,FALSE,,,,https://apnanetwork.co.nz/,https://i.imgur.com/35Fwz9F.png
->>>>>>> 67571e733e477c7af6ecc0bd1a584ab1f6a23399
 ApolloMediaCenter.us,Apollo Media Center,,,,US,US-NY,Buffalo,s/US-NY,eng,general,FALSE,,,,https://apollomediacenter.com/live-stream,https://i.imgur.com/8uXm45w.png
 ApostolicOnenessNetwork.us,Apostolic Oneness Network,,,,US,US-IA,Des Moines,c/US,eng,religious,FALSE,,,,https://aon.lightcast.com/,https://i.imgur.com/6BnF2vH.png
 ApostolTV.hu,Apostol TV,,,,HU,,Budapest,c/HU,hun,religious,FALSE,,,,http://apostoltv.hu/,https://i.imgur.com/C43Cc9N.png
@@ -1893,10 +1874,7 @@ AsiesmiGenteTV.us,Asi es mi Gente TV,Así es mi Gente TV,,,US,US-DC,Washington,c
 AsilTV.ir,Asil TV,,,,IR,,,c/IR,ara,,FALSE,,,,http://webtv.islamasil.net/,https://i.imgur.com/gROQqFD.png
 AsiriTV.pe,AsiriTV,,,,PE,PE-LIM,Lima,c/PE,spa,culture,FALSE,,,,https://asiritv.pe/,https://i.imgur.com/7bGVFBa.png
 AsiSucedeGuanajuato.mx,Asi Sucede Guanajuato,Así Sucede Guanajuato;Canal 71 Celaya,,,MX,MX-GUA,Celaya,c/MX,spa,general,FALSE,,,,https://asisucedegto.mx/,https://i.imgur.com/6W7HUtG.png
-<<<<<<< HEAD
-=======
 AsluTV.mv,Aslu TV,,,,MV,,,c/MV,div,general,FALSE,,,,https://aslu.com.mv/,https://i.imgur.com/RTv6klV.jpeg
->>>>>>> 67571e733e477c7af6ecc0bd1a584ab1f6a23399
 Asomavision.ec,Asomavision,Asomavisión,,,EC,,Quito,c/EC,spa,,FALSE,,,,https://www.asomavision.com/,https://i.imgur.com/a5avk5R.png
 AsomdweeRadioTV.us,Asomdwee Radio & TV,,,Asomdwee Media Group,US,US-MD,Rockville,c/US;c/GH,eng,religious,FALSE,,,,https://www.ghanaweb.com/radio/new-radio.php?ID=304,https://i.imgur.com/oIVyl1t.jpg
 ASondeSalsa.pa,A Son de Salsa,,,,PA,,Panama City,r/HISPAM,spa,music,FALSE,,,,https://asondesalsa.com.pa/tv-online/,https://i.imgur.com/Nv8SAJq.png