Fixed merge conflicts

2023-03-01 16:34:30 +01:00 · 2023-03-01 16:34:30 +01:00 · a7a243a736
commit a7a243a736
parent 40531ba7b9 f88943af1b
149 changed files with 248 additions and 15 deletions
--- a/lib/domains/ae/42abudhabi/student.txt
+++ b/lib/domains/ae/42abudhabi/student.txt
@ -0,0 +1,2 @@
+42 Abu Dhabi
+42 Abu Dhabi
--- a/lib/domains/am/shirakatsy.txt
+++ b/lib/domains/am/shirakatsy.txt
@ -0,0 +1,2 @@
+Շիրակացու Ճեմարան
+SHIRAKATSY LYCEUM INTERNATIONAL SCIENTIFIC-EDUCATIONAL COMPLEX
--- a/lib/domains/au/edu/wa/smtafe.txt
+++ b/lib/domains/au/edu/wa/smtafe.txt
@ -0,0 +1 @@
+South Metropolitan TAFE
--- a/lib/domains/ba/edu/ssst.txt
+++ b/lib/domains/ba/edu/ssst.txt
@ -1 +0,0 @@
-Sarajevo School of Science and Technology
--- a/lib/domains/be/sgr20/leerling.txt
+++ b/lib/domains/be/sgr20/leerling.txt
@ -0,0 +1,2 @@
+GO! Atheneum Zottegem
+GO! Atheneum Zottegem
--- a/lib/domains/bg/codingburgas.txt
+++ b/lib/domains/bg/codingburgas.txt
@ -0,0 +1,2 @@
+Професионална Гимназия по Компютърно Програмиране и иновации
+Vocational School for Computer Programming and Innovations
--- a/lib/domains/br/com/edumail.txt
+++ b/lib/domains/br/com/edumail.txt
@ -1,2 +0,0 @@
-Faculdade Pitágoras Ipatinga
-Faculdade Pitágoras Ipatinga
--- a/lib/domains/br/edu/fmpsc/aluno.txt
+++ b/lib/domains/br/edu/fmpsc/aluno.txt
@ -0,0 +1,2 @@
+Faculdade Municipal de Palhoça
+Municipal College of Palhoca
--- a/lib/domains/br/edu/fve/univap.txt
+++ b/lib/domains/br/edu/fve/univap.txt
@ -0,0 +1,2 @@
+Universidade do Vale do Paraiba
+University of Vale do Paraiba
--- a/lib/domains/br/edu/unespar.txt
+++ b/lib/domains/br/edu/unespar.txt
@ -0,0 +1,2 @@
+Universidade Estadual do Paraná
+State University of Paraná
--- a/lib/domains/ca/mytsom.txt
+++ b/lib/domains/ca/mytsom.txt
@ -0,0 +1,2 @@
+Toronto School of Management
+Toronto School of Management
--- a/lib/domains/ci/edu/esatic.txt
+++ b/lib/domains/ci/edu/esatic.txt
@ -0,0 +1 @@
+ECOLE SUPERIEUR AFRICAINE DES TICS(ESATIC)
--- a/lib/domains/cn/edu/ytu.txt
+++ b/lib/domains/cn/edu/ytu.txt
@ -0,0 +1 @@
+YANTAI UNIVERSITY
--- a/lib/domains/cn/huilieducation.txt
+++ b/lib/domains/cn/huilieducation.txt
@ -0,0 +1,2 @@
+上海浦东新区民办惠立学校
+Huili School Shanghai
--- a/lib/domains/cn/net/shouhua.txt
+++ b/lib/domains/cn/net/shouhua.txt
@ -1 +0,0 @@
-Shanghai Ouhua Vocational Technical College
--- a/lib/domains/co/colc.txt
+++ b/lib/domains/co/colc.txt
@ -1 +0,0 @@
-The City of Liverpool College
--- a/lib/domains/co/edu/pi.txt
+++ b/lib/domains/co/edu/pi.txt
@ -0,0 +1,2 @@
+Politécnico internacional
+Politecnico internacional
--- a/lib/domains/com/pgi-varna.txt
+++ b/lib/domains/com/pgi-varna.txt
@ -0,0 +1 @@
+PGI "Dr. Ivan Bogorov"
--- a/lib/domains/com/rondebosch.txt
+++ b/lib/domains/com/rondebosch.txt
@ -0,0 +1 @@
+Rondebosch Boys' Schools
--- a/lib/domains/com/shohzyxy.txt
+++ b/lib/domains/com/shohzyxy.txt
@ -0,0 +1,2 @@
+上海欧华职业技术学院
+Shanghai Ouhua College
--- a/lib/domains/com/swargaranischool.txt
+++ b/lib/domains/com/swargaranischool.txt
@ -0,0 +1 @@
+swargarani school
--- a/lib/domains/cr/ac/ulead.txt
+++ b/lib/domains/cr/ac/ulead.txt
@ -0,0 +1 @@
+Lead University
--- a/lib/domains/de/gyfa-hh.txt
+++ b/lib/domains/de/gyfa-hh.txt
@ -0,0 +1 @@
+Gymnasium Farmsen
--- a/lib/domains/de/ukbonn.txt
+++ b/lib/domains/de/ukbonn.txt
@ -0,0 +1,2 @@
+Universitätsklinikum Bonn
+University Hospital Bonn
--- a/lib/domains/de/wvss-wetzlar.txt
+++ b/lib/domains/de/wvss-wetzlar.txt
@ -0,0 +1 @@
+Werner-von-Siemens-Schule Wetzlar
--- a/lib/domains/ec/edu/uniandes.txt
+++ b/lib/domains/ec/edu/uniandes.txt
@ -0,0 +1,2 @@
+Universidad Regional Autónoma de Los Andes
+Regional Autonomous University of Los Andes
--- a/lib/domains/edu/psgtech.txt
+++ b/lib/domains/edu/psgtech.txt
@ -0,0 +1 @@
+PSG College Of Technology, Coimbatore
--- a/lib/domains/edu/sans.txt
+++ b/lib/domains/edu/sans.txt
@ -0,0 +1 @@
+SANS Technology Institute
--- a/lib/domains/ee/kbfi.txt
+++ b/lib/domains/ee/kbfi.txt
@ -0,0 +1,2 @@
+Keemilise ja Bioloogilise Füüsika Instituut
+National Institute of Chemical Physics and Biophysics
--- a/lib/domains/eg/edu/deltauniv.txt
+++ b/lib/domains/eg/edu/deltauniv.txt
@ -0,0 +1 @@
+Delta University for Science & Technology (EG)
--- a/lib/domains/eg/edu/eru.txt
+++ b/lib/domains/eg/edu/eru.txt
@ -0,0 +1,2 @@
+Egyptian Russian University
+Egyptian Russian University
--- a/lib/domains/eg/edu/gu.txt
+++ b/lib/domains/eg/edu/gu.txt
@ -0,0 +1,2 @@
+galala university
+galala university
--- a/lib/domains/eu/euroakadeemia.txt
+++ b/lib/domains/eu/euroakadeemia.txt
@ -1 +0,0 @@
-Euroakadeemia
--- a/lib/domains/fr/adatechschool/student.txt
+++ b/lib/domains/fr/adatechschool/student.txt
@ -0,0 +1 @@
+Ada Tech School
--- a/lib/domains/fr/s-fx.txt
+++ b/lib/domains/fr/s-fx.txt
@ -0,0 +1,2 @@
+Saint-François-Xavier
+Jesuit School Saint-François-Xavier
--- a/lib/domains/fr/saintaubinlasalle.txt
+++ b/lib/domains/fr/saintaubinlasalle.txt
@ -0,0 +1 @@
+Saint Aubin La Salle
--- a/lib/domains/gr/edu/sivitanidios.txt
+++ b/lib/domains/gr/edu/sivitanidios.txt
@ -0,0 +1,2 @@
+Sivitanidios DSTE
+Sivitanidios Public School of Arts and Professions
--- a/lib/domains/gr/mc-class.txt
+++ b/lib/domains/gr/mc-class.txt
@ -0,0 +1 @@
+Mediterranean College
--- a/lib/domains/gt/edu/kinal.txt
+++ b/lib/domains/gt/edu/kinal.txt
@ -0,0 +1,2 @@
+Fundacion Kinal
+Fundacion Kinal
--- a/lib/domains/hk/edu/kis/is.txt
+++ b/lib/domains/hk/edu/kis/is.txt
@ -0,0 +1 @@
+Korean International School
--- a/lib/domains/hu/zipernowsky.txt
+++ b/lib/domains/hu/zipernowsky.txt
@ -0,0 +1 @@
+BMSZC Zipernowsky Károly Műszaki Technikum
--- a/lib/domains/id/sch/pppkpetra/student.txt
+++ b/lib/domains/id/sch/pppkpetra/student.txt
@ -0,0 +1 @@
+Sekolah Kristen Petra 4
--- a/lib/domains/id/sch/smkpasirian-lmj.txt
+++ b/lib/domains/id/sch/smkpasirian-lmj.txt
@ -0,0 +1 @@
+SMK Negeri Pasirian Lumajang
--- a/lib/domains/id/sch/smkpgripekanbaru.txt
+++ b/lib/domains/id/sch/smkpgripekanbaru.txt
@ -0,0 +1 @@
+SMK PGRI Pekanbaru
--- a/lib/domains/id/sch/smktiannajiyah.txt
+++ b/lib/domains/id/sch/smktiannajiyah.txt
@ -0,0 +1,2 @@
+SMK TI ANNAJIYAH BU JOMBANG
+information technology vocational high school
--- a/lib/domains/id/sch/smktiannajiyah/siswa.txt
+++ b/lib/domains/id/sch/smktiannajiyah/siswa.txt
@ -0,0 +1,2 @@
+SMK TI ANNAJIYAH BU JOMBANG
+information technology vocational high school
--- a/lib/domains/in/ac/kgkite.txt
+++ b/lib/domains/in/ac/kgkite.txt
@ -0,0 +1 @@
+KGiSL Institute of Technology, Coimbatore
--- a/lib/domains/in/ac/psgitech.txt
+++ b/lib/domains/in/ac/psgitech.txt
@ -0,0 +1 @@
+PSG Institute of Technology and Applied Research, Coimbatore
--- a/lib/domains/in/ac/psgtech.txt
+++ b/lib/domains/in/ac/psgtech.txt
@ -0,0 +1 @@
+PSG College of Technology, Coimbatore
--- a/lib/domains/in/edu/cit.txt
+++ b/lib/domains/in/edu/cit.txt
@ -0,0 +1,2 @@
+CIT
+Coimbatore Institute of Technology, Coimbatore
--- a/lib/domains/in/edu/sxcce.txt
+++ b/lib/domains/in/edu/sxcce.txt
@ -0,0 +1 @@
+St. Xavier's Catholic College of Engineering, Nagercoil
--- a/lib/domains/it/42roma.txt
+++ b/lib/domains/it/42roma.txt
@ -0,0 +1,3 @@
+42 Roma Luiss
+42 Roma
+42 Rome
--- a/lib/domains/it/donboscoborgo.txt
+++ b/lib/domains/it/donboscoborgo.txt
@ -0,0 +1 @@
+Liceo Economico Sociale / Collegio Don Bosco
--- a/lib/domains/it/edu/lsdonegani.txt
+++ b/lib/domains/it/edu/lsdonegani.txt
@ -0,0 +1 @@
+Polo liceale città di Sondrio
--- a/lib/domains/it/itarchimede.txt
+++ b/lib/domains/it/itarchimede.txt
@ -0,0 +1,2 @@
+I.T. Archimede
+I.T. Archimede
--- a/lib/domains/it/itisff.txt
+++ b/lib/domains/it/itisff.txt
@ -0,0 +1 @@
+ITIS E.Fermi Francavilla Fontana
--- a/lib/domains/it/polotecnologicoimperiese.txt
+++ b/lib/domains/it/polotecnologicoimperiese.txt
@ -0,0 +1 @@
+I.I.S. POLO TECNOLOGICO IMPERIESE
--- a/lib/domains/it/unimercatorum.txt
+++ b/lib/domains/it/unimercatorum.txt
@ -0,0 +1,2 @@
+Università Mercatorum
+https://www.unimercatorum.it/
--- a/lib/domains/ke/ac/laikipia/student.txt
+++ b/lib/domains/ke/ac/laikipia/student.txt
@ -0,0 +1 @@
+Laikipia University
--- a/lib/domains/ke/ac/mpesafoundationacademy.txt
+++ b/lib/domains/ke/ac/mpesafoundationacademy.txt
@ -0,0 +1 @@
+Mpesa Foundation Academy
--- a/lib/domains/ke/ac/must/students.txt
+++ b/lib/domains/ke/ac/must/students.txt
@ -0,0 +1 @@
+Meru University of Science and Technology
--- a/lib/domains/ke/ac/seku.txt
+++ b/lib/domains/ke/ac/seku.txt
@ -0,0 +1 @@
+South Eastern Kenya University
--- a/lib/domains/kr/hs/sshs.txt
+++ b/lib/domains/kr/hs/sshs.txt
@ -0,0 +1,7 @@
+Seoul Science High School
+서울과학고등학교
+
+official website(Korean): https://sshs.sen.hs.kr/
+official website(English): http://en.sshs.hs.kr/html/index.php
+curriculum: download "2022교육계획서_서울과학고(0421).pdf" at https://sshs.sen.hs.kr/120316/subMenu.do. Then, look at the page 26.
+proof of official domain(screenshot): https://drive.google.com/file/d/18r7TRVlMpuGLb7Dgfif3kFZ9FZurm0Jp/view?usp=sharing
--- a/lib/domains/kw/edu/paaet.txt
+++ b/lib/domains/kw/edu/paaet.txt
@ -0,0 +1,2 @@
+PAAET
+Public Authority for Applied Education and Training
--- a/lib/domains/kz/intc.txt
+++ b/lib/domains/kz/intc.txt
@ -0,0 +1,2 @@
+ИННОВАЦИОННЫЙ ТЕХНИЧЕСКИЙ КОЛЛЕДЖ
+Innovative Technical College
--- a/lib/domains/lt/kmmokykla.txt
+++ b/lib/domains/lt/kmmokykla.txt
@ -0,0 +1 @@
+Karalienės Mortos mokykla
--- a/lib/domains/lt/rackauskas.txt
+++ b/lib/domains/lt/rackauskas.txt
@ -0,0 +1 @@
+Mažeikių Merkelio Račkausko gimnazija
--- a/lib/domains/ma/ac/iga/etud.txt
+++ b/lib/domains/ma/ac/iga/etud.txt
@ -0,0 +1 @@
+L’école supérieure d’Ingénierie et de Management.
--- a/lib/domains/mk/edu/next.txt
+++ b/lib/domains/mk/edu/next.txt
@ -0,0 +1 @@
+Brainster Next College
--- a/lib/domains/mm/edu/ucsdawei.txt
+++ b/lib/domains/mm/edu/ucsdawei.txt
@ -0,0 +1,2 @@
+University of Computer Studies, Dawei
+University of Computer Studies, Dawei
--- a/lib/domains/mn/edu/csms.txt
+++ b/lib/domains/mn/edu/csms.txt
@ -0,0 +1,2 @@
+Компьютерийн техник, менежментийн сургууль
+School of Computer Science and Management
--- a/lib/domains/mn/edu/miu.txt
+++ b/lib/domains/mn/edu/miu.txt
@ -0,0 +1,2 @@
+Монголын Олон Улсын Дээд Сургууль
+Mongolia International University
--- a/lib/domains/mn/edu/shineue.txt
+++ b/lib/domains/mn/edu/shineue.txt
@ -0,0 +1,2 @@
+Шинэ Үе
+Shine ue
--- a/lib/domains/mx/edu/cecytebc.txt
+++ b/lib/domains/mx/edu/cecytebc.txt
@ -0,0 +1 @@
+Colegio de Estudios Científicos y Tecnológicos del Estado de Baja California
--- a/lib/domains/mx/edu/cesunbc.txt
+++ b/lib/domains/mx/edu/cesunbc.txt
@ -0,0 +1 @@
+CESUN
--- a/lib/domains/mx/edu/itcancun.txt
+++ b/lib/domains/mx/edu/itcancun.txt
@ -0,0 +1 @@
+Instituto Tecnologico de Cancún
--- a/lib/domains/mx/edu/itesa.txt
+++ b/lib/domains/mx/edu/itesa.txt
@ -0,0 +1 @@
+Instituto Tecnológico Superior del Oriente del Estado de Hidalgo
--- a/lib/domains/mx/edu/itvy.txt
+++ b/lib/domains/mx/edu/itvy.txt
@ -0,0 +1,2 @@
+Instituto Tecnologico del Valle Del Yaqui
+Technological Institute of the Yaqui Valley
--- a/lib/domains/mx/edu/miutt.txt
+++ b/lib/domains/mx/edu/miutt.txt
@ -0,0 +1,2 @@
+Universidad Tecnologica de Tijuana
+Technological University of Tijuana
--- a/lib/domains/mx/edu/ulsa-noroeste.txt
+++ b/lib/domains/mx/edu/ulsa-noroeste.txt
@ -0,0 +1 @@
+Universidad La Salle Noroeste
--- a/lib/domains/mx/edu/upp.txt
+++ b/lib/domains/mx/edu/upp.txt
@ -0,0 +1 @@
+Universidad Politécnica de Pachuca
--- a/lib/domains/mx/edu/upvm.txt
+++ b/lib/domains/mx/edu/upvm.txt
@ -0,0 +1 @@
+Universidad Politécnica del Valle de México
--- a/lib/domains/my/edu/hinhua.txt
+++ b/lib/domains/my/edu/hinhua.txt
@ -0,0 +1 @@
+Hin Hua High School
--- a/lib/domains/mz/ac/uem.txt
+++ b/lib/domains/mz/ac/uem.txt
@ -0,0 +1 @@
+Universidade Eduardo Mondlane
--- a/lib/domains/net/bedfordnhk12.txt
+++ b/lib/domains/net/bedfordnhk12.txt
@ -0,0 +1 @@
+Bedford School District NH
--- a/lib/domains/net/lcieducation.txt
+++ b/lib/domains/net/lcieducation.txt
@ -0,0 +1 @@
+LaSalle College Institute - Vancouver
--- a/lib/domains/net/litech.txt
+++ b/lib/domains/net/litech.txt
@ -0,0 +1 @@
+Технічний фаховий коледж Національного університету "Львівська політехніка"
--- a/lib/domains/ng/net/lbs.txt
+++ b/lib/domains/ng/net/lbs.txt
@ -0,0 +1 @@
+Lagos Business School, Pan-Atlantic University, Lagos
--- a/lib/domains/nl/celeanum.txt
+++ b/lib/domains/nl/celeanum.txt
@ -0,0 +1 @@
+Gymnasium Celeanum Zwolle
--- a/lib/domains/nl/obszeester.txt
+++ b/lib/domains/nl/obszeester.txt
@ -1 +0,0 @@
-Basisschool Vlieland
--- a/lib/domains/np/edu/cdcsit.txt
+++ b/lib/domains/np/edu/cdcsit.txt
@ -0,0 +1 @@
+Central Department of Computer Science and Information Technology
--- a/lib/domains/np/edu/eastpoleschool.txt
+++ b/lib/domains/np/edu/eastpoleschool.txt
@ -0,0 +1 @@
+East-Pole School
--- a/lib/domains/np/edu/iimscollege.txt
+++ b/lib/domains/np/edu/iimscollege.txt
@ -0,0 +1 @@
+Institute OF International Management Science
--- a/lib/domains/np/edu/jamc.txt
+++ b/lib/domains/np/edu/jamc.txt
@ -0,0 +1 @@
+Jana Adarsha Multiple Campus
--- a/lib/domains/np/edu/kist.txt
+++ b/lib/domains/np/edu/kist.txt
@ -0,0 +1 @@
+KIST College & SS
--- a/lib/domains/np/edu/nihareekacollege.txt
+++ b/lib/domains/np/edu/nihareekacollege.txt
@ -0,0 +1,3 @@
+Nihareeka College of Science and technolgy
+Biratnagar, Morang 56613, Nepal
+http://nihareekacollege.edu.np/
--- a/lib/domains/np/edu/swastikcollege.txt
+++ b/lib/domains/np/edu/swastikcollege.txt
@ -0,0 +1 @@
+Swastik College
--- a/lib/domains/np/edu/thamescollege.txt
+++ b/lib/domains/np/edu/thamescollege.txt
@ -0,0 +1 @@
+Thames International College Pvt. Ltd.
--- a/lib/domains/org/beehiveacademy/student.txt
+++ b/lib/domains/org/beehiveacademy/student.txt
@ -0,0 +1 @@
+Beehive Academy
--- a/lib/domains/org/cgps.txt
+++ b/lib/domains/org/cgps.txt
@ -0,0 +1 @@
+columbia grammar and preparatory school
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`Delta University for Science & Technology (EG)`
				`@ -0,0 +1 @@`
				`BMSZC Zipernowsky Károly Műszaki Technikum`
				`@ -0,0 +1 @@`
				`PSG Institute of Technology and Applied Research, Coimbatore`
				`@ -0,0 +1 @@`
				`St. Xavier's Catholic College of Engineering, Nagercoil`
				`@ -0,0 +1 @@`
				`Liceo Economico Sociale / Collegio Don Bosco`
				`@ -0,0 +1 @@`
				`L’école supérieure d’Ingénierie et de Management.`
				`@ -0,0 +1 @@`
				`Colegio de Estudios Científicos y Tecnológicos del Estado de Baja California`
				`@ -0,0 +1 @@`
				`Instituto Tecnológico Superior del Oriente del Estado de Hidalgo`
				`@ -0,0 +1 @@`
				`Universidad Politécnica del Valle de México`
				`@ -0,0 +1 @@`
				`Технічний фаховий коледж Національного університету "Львівська політехніка"`