auto save

2021-06-07 13:55:08 +09:00 · 2021-06-07 13:55:08 +09:00 · 66a10ec1f9
parent f75603c3cb
commit 66a10ec1f9
38 changed files with 1 additions and 176 deletions
--- a/25/01.txt
+++ b/25/01.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
 \v 1 Navvo Myao Kodon go fae No Myao Kodon,nohov ni Go ke angkeden Go fwi ke,Go ni wan-wan faran no ke rageke gu,Go duv bae sin. \v 2 Go ni ene kota faran ke hatae ni raki farasir ke,haim-haim rigav istana faran ke \v 3 one manae haisav gagae riga ani Go ni adimaken,kota bainam-bainam ani Go ke tadan maimaken.
-=======
-\c 25 Kisgam Myao Kodon onhan kisgam \v 1 Navvo Myao Kodon go fae No Myao Kodon,nohov ni Go ke angkeden Go fwi ke,Go ni wan-wan faran no ke rageke gu,Go duv bae sin. \v 2 Go ni ene kota faran ke hatae ni raki farasir ke,haim-haim rigav istana faran ke \v 3 one manae haisav gagae riga ani Go ni adimaken,kota bainam-bainam ani Go ke tadan maimaken.
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:bahasatech.indotimur/saw_isa_text_reg.git
--- a/25/04.txt
+++ b/25/04.txt
@ -1,6 +1 @@
-<<<<<<< HEAD
 \v 4 Go fae savsavov rigav ke,wan amhav rigav ke,duv amjav mae arake rigav ke gavus faken,Go fae atav sef kahane ke raumhanae danama kahane ni davan nahav ke. \v 5 Go ni arasev faran ke raumhanae davan naha utuv ke husar gagae roh tae uru ke sangke. Myao Kodon sin e gavus fadev riga grae sin farakir
-=======
-\v 4 Go fae savsavov rigav ke,wan amhav rigav ke,duv amjav mae arake rigav ke gavus faken,Go fae atav sef kahane ke raumhanae danama kahane ni davan nahav ke. \v 5 Go ni arasev faran ke raumhanae davan naha utuv ke husar gagae roh tae uru ke sangke.
-Myao Kodon sin e gavus fadev riga grae sin farakir
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:bahasatech.indotimur/saw_isa_text_reg.git
--- a/26/01.txt
+++ b/26/01.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
 \v 1 One atav fae ni baidimaken rigav ani Yehuda hatae nake tarfaimaken kisgam:Nagav ni kwae gagae haim faran kisirin,efae ni haisav wan farasiren. \v 2 Aivat faran kaifa gwanid haim der rigav ani naha urgman
-=======
-\c 26 Myao Kodon ke onhakir kisgam \v 1 One atav fae ni baidimaken rigav ani Yehuda hatae nake tarfaimaken kisgam:Nagav ni kwae gagae haim faran kisirin,efae ni haisav wan farasiren. \v 2 Aivat faran kaifa gwanid haim der rigav ani naha urgman
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:bahasatech.indotimur/saw_isa_text_reg.git
--- a/26/11.txt
+++ b/26/11.txt
@ -1,6 +1 @@
-<<<<<<< HEAD
 \v 11 Myao Kodon ah go it haisav ke nahav ni nahdo haser,Myao Kodon a Go it haisav ke nahav ni nahane orasaraden Go haisav ani naha ke usaden. \v 12 Myao Kodon Go ni der ke fege davan,nigiv ke Go ni ke tae nigiv ketadan siren,nigiv karya tae Goni gavus faken. Myao Kodon ani badan harae fidaimaken e umat ke
-=======
-\v 11 Myao Kodon ah go it haisav ke nahav ni nahdo haser,Myao Kodon a Go it haisav ke nahav ni nahane orasaraden Go haisav ani naha ke usaden. \v 12 Myao Kodon Go ni der ke fege davan,nigiv ke Go ni ke tae nigiv ketadan siren,nigiv karya tae Goni gavus faken.
-Myao Kodon ani badan harae fidaimaken e umat ke
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:bahasatech.indotimur/saw_isa_text_reg.git
--- a/26/19.txt
+++ b/26/19.txt
@ -1,7 +1 @@
-<<<<<<< HEAD
 \v 19 Go rigav ani ganhaimakeni ke girmaimaken,hatae fohav ke gamhanae difarke rigavo girma faramjaeno onhamjaen ene bumi ni ganhan fahaton tarmaimake. Hadiah grae homon grae fidaimaken
-=======
-\v 19 Go rigav ani ganhaimakeni ke girmaimaken,hatae fohav ke gamhanae difarke rigavo girma faramjaeno onhamjaen ene bumi ni ganhan fahaton tarmaimake.
-
-Hadiah grae homon grae fidaimaken
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:bahasatech.indotimur/saw_isa_text_reg.git
--- a/27/01.txt
+++ b/27/01.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
 \v 1 One tav vae Myao Kodon ani hukum fidaimaken Lewiatan ke.Haud ovae tarhasire e karem ani umaken.Lewiatan vae ovae,piri ke bai naga ke usur ke \v 2 one tuv tae kebun anggur onhan kisgam ke marakir ke. \v 3 No vae Myao Kodon,Nohov ni fasibaden ah kahane tae Nohov ni araanemaden adigav bisumhui fasibanamaden
-=======
-\c 27 \v 1 One tav vae Myao Kodon ani hukum fidaimaken Lewiatan ke.Haud ovae tarhasire e karem ani umaken.Lewiatan vae ovae,piri ke bai naga ke usur ke \v 2 one tuv tae kebun anggur onhan kisgam ke marakir ke. \v 3 No vae Myao Kodon,Nohov ni fasibaden ah kahane tae Nohov ni araanemaden adigav bisumhui fasibanamaden
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:bahasatech.indotimur/saw_isa_text_reg.git
--- a/27/06.txt
+++ b/27/06.txt
@ -1,6 +1 @@
-<<<<<<< HEAD
 \v 6 Mud gatav atav baidimaken Yakub ani kefkef yaundimaken Israel ani ir yaudimaken ene bumi reftav ke burfanae dadaimaken. Allah ni Israel ke hamjaen disir pembuangan
-=======
-\v 6 Mud gatav atav baidimaken Yakub ani kefkef yaundimaken Israel ani ir yaudimaken ene bumi reftav ke burfanae dadaimaken.
-Allah ni Israel ke hamjaen disir pembuangan
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:bahasatech.indotimur/saw_isa_text_reg.git
--- a/28/01.txt
+++ b/28/01.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
 \v 1 Yagivo yaitu ah migiman gagae Efraim rigavo,anggur ah ani kala fina mahaim \v 2 nahadimjaen Myao kodon haisav ke kwae grae,boton faran ani ah grae sarema haisav kahane E kwae baen.
-=======
-\c 28 Sin Israel rigav utara amin ke bai ke agansir \v 1 Yagivo yaitu ah migiman gagae Efraim rigavo,anggur ah ani kala fina mahaim \v 2 nahadimjaen Myao kodon haisav ke kwae grae,boton faran ani ah grae sarema haisav kahane E kwae baen.
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:bahasatech.indotimur/saw_isa_text_reg.git
--- a/28/07.txt
+++ b/28/07.txt
@ -1,6 +1 @@
-<<<<<<< HEAD
 \v 7 manae rigv yaitu anggur ani megima ma bae kod haur tim kesaneman imam grae,nabi grae,nahav ni tae rafgaimaken anggur ani makotae.Naha sigi naha mutuv ke rafgaimaken. \v 8 Enefaran meja bae ohadon ani burfarnae dadaimake ke maidav papeni der dadahaser sene ahodon kesadimaken. Allah E umat ke gavus favi nenae ke
-=======
-\v 7 manae rigv yaitu anggur ani megima ma bae kod haur tim kesaneman imam grae,nabi grae,nahav ni tae rafgaimaken anggur ani makotae.Naha sigi naha mutuv ke rafgaimaken. \v 8 Enefaran meja bae ohadon ani burfarnae dadaimake ke maidav papeni der dadahaser sene ahodon kesadimaken.
-Allah E umat ke gavus favi nenae ke
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:bahasatech.indotimur/saw_isa_text_reg.git
--- a/28/13.txt
+++ b/28/13.txt
@ -1,6 +1 @@
-<<<<<<< HEAD
 \v 13 Myao Kodon sin nahav ke agansir ke:Sin ani ke agane-agane makeden,sin roh ani,ke raufada-raufada makeden manae nahav ni hamke hanae afganae naha haugaden nenae. Myao Kodon amon nake rogabos ani maidav pape motanae hadevyah
-=======
-\v 13 Myao Kodon sin nahav ke agansir ke:Sin ani ke agane-agane makeden,sin roh ani,ke raufada-raufada makeden manae nahav ni hamke hanae afganae naha haugaden nenae.
-Myao Kodon amon nake rogabos ani maidav pape motanae hadevyah
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:bahasatech.indotimur/saw_isa_text_reg.git
--- a/28/22.txt
+++ b/28/22.txt
@ -1,6 +1 @@
-<<<<<<< HEAD
 \v 22 One manae merhau sin fanom atav baidimaken ene aiyao,uru aiyao haur yakimake atav sarimaken baidimaken Myao Kodon ani aganke sin. Myao Kodon ani fidaimake amon bae sin adil bohos ani fidaimaken
-=======
-\v 22 One manae merhau sin fanom atav baidimaken ene aiyao,uru aiyao haur yakimake atav sarimaken baidimaken Myao Kodon ani aganke sin.
-Myao Kodon ani fidaimake amon bae sin adil bohos ani fidaimaken
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:bahasatech.indotimur/saw_isa_text_reg.git
--- a/29/01.txt
+++ b/29/01.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
 \v 1 Ariel goni yagofo,Ariel bae ovae Daud ani avhai maginae bain one tuv ke. \v 2 Manae ke nohov ni Ariel ke arfe faimaken,sesar grae kod anhag grae manae Ariel ani no amin hov badaimaken.
-=======
-\c 29 Myao Kodon ani erusalem ke hukum masir sin \v 1 Ariel goni yagofo,Ariel bae ovae Daud ani avhai maginae bain one tuv ke. \v 2 Manae ke nohov ni Ariel ke arfe faimaken,sesar grae kod anhag grae manae Ariel ani no amin hov badaimaken.
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:bahasatech.indotimur/saw_isa_text_reg.git
--- a/29/16.txt
+++ b/29/16.txt
@ -1,6 +1 @@
-<<<<<<< HEAD
 \v 16 Gini ke arhamon faran ke sansiren,efae ni no ke magido hasero efae ni wan nyam haser. Atav aiyao atav baidimaken
-=======
-\v 16 Gini ke arhamon faran ke sansiren,efae ni no ke magido hasero efae ni wan nyam haser.
-Atav aiyao atav baidimaken
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:bahasatech.indotimur/saw_isa_text_reg.git
--- a/30/01.txt
+++ b/30/01.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
 \v 1 Amon mamake hargiav celaka kimaken, Myao Kodon Sin, sin farkimakedav, manae NO Sin anid; persekutuan ke bentuk mamakedav, manae NO-Roh nake nid, onemanae nahani haiyam manae ke haiyam ma maho bana madav; \v 2 Mesir ke hasir NO-Ke dari naha dimjav ni, Firaun nake raumhavinenae, onake Mesir raumhadev bayangan ke ravgavi nenae.
-=======
-\c 30 Israel Bae Myao Kodon ke Percaya man, Mesir ke Haser \v 1 Amon mamake hargiav celaka kimaken, Myao Kodon Sin, sin farkimakedav, manae NO Sin anid; persekutuan ke bentuk mamakedav, manae NO-Roh nake nid, onemanae nahani haiyam manae ke haiyam ma maho bana madav; \v 2 Mesir ke hasir NO-Ke dari naha dimjav ni, Firaun nake raumhavinenae, onake Mesir raumhadev bayangan ke ravgavi nenae.
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:bahasatech.indotimur/saw_isa_text_reg.git
--- a/30/03.txt
+++ b/30/03.txt
@ -1,7 +1 @@
-<<<<<<< HEAD
 \v 3 One manae ovae, Firaun ani raumhaike bae go haiyam, manae naungan vohav bayangan Mesir gov aeve vadev vaimaken. \v 4 Muduradev rigav zoan ke bain manae, sinamtai rigav tae hanes mae dinsir, \v 5 Enevaran rigav orasaradimaken bangsa vae naidav berguna haser nenae naha ke, naha gavus va haser nenae, iti davae bae orasaradon grae haiyam grae one davan,''                                    Myao Kodon ani Yehuda ke Pesan Masir
-=======
-\v 3 One manae ovae, Firaun ani raumhaike bae go haiyam, manae naungan vohav bayangan Mesir gov aeve vadev vaimaken. \v 4 Muduradev rigav zoan ke bain manae, sinamtai rigav tae hanes mae dinsir, \v 5 Enevaran rigav orasaradimaken bangsa vae naidav berguna haser nenae naha ke, naha gavus va haser nenae, iti davae bae orasaradon grae haiyam grae one davan,''
-
-                                   Myao Kodon ani Yehuda ke Pesan Masir
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:bahasatech.indotimur/saw_isa_text_reg.git
--- a/30/10.txt
+++ b/30/10.txt
@ -1,9 +1 @@
-<<<<<<< HEAD
 \v 10 Nahandev rigav ke aganke, nahadon nom,'' nabi ke tae, nubuatan man nom nigiv utuv nake der sin av, merhau nubuatan ani nigiv ke agadimjen.'' \v 11 Dumarav nake ririntairanjen, ene dumarav nake rinjakanjen. Biarkan manjen nigike Maha Kudus Israel nake E-Sin darijeni badavini.                                                          Yehuda Gavus Vadeb bae Haur Navo Nake sariken  vatar ani bavhanae haosadivi make kahane.
-=======
-\v 10 Nahandev rigav ke aganke, nahadon nom,'' nabi ke tae, nubuatan man nom nigiv utuv nake der sin av, merhau nubuatan ani nigiv ke agadimjen.'' \v 11 Dumarav nake ririntairanjen, ene dumarav nake rinjakanjen. Biarkan manjen nigike Maha Kudus Israel nake E-Sin darijeni badavini.
-                    
-                                    Yehuda Gavus Vadeb bae Haur Navo Nake sariken
-
- vatar ani bavhanae haosadivi make kahane.
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:bahasatech.indotimur/saw_isa_text_reg.git
--- a/30/17.txt
+++ b/30/17.txt
@ -1,7 +1 @@
-<<<<<<< HEAD
 \v 17 Maidav hovhan ani pai nokotae seribu rigav bohodoho haimaken. lima rigav ani pai nokotae, gini tarhaimaken onake gike vishaimake yakae haur ke vadaimaken tiang kahane bukit haur ke vadaimake bendera kahane.                                                                                      Haur Navo E-Umat ke Gavus vaimaken
-=======
-\v 17 Maidav hovhan ani pai nokotae seribu rigav bohodoho haimaken. lima rigav ani pai nokotae, gini tarhaimaken onake gike vishaimake yakae haur ke vadaimaken tiang kahane bukit haur ke vadaimake bendera kahane.   
-                                           
-                                      Haur Navo E-Umat ke Gavus vaimaken
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:bahasatech.indotimur/saw_isa_text_reg.git
--- a/32/01.txt
+++ b/32/01.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
 \v 1 raja ni motanae dadahomae sin agado homae badai maken sin bohos sin raja ni, \v 2 yamos-yamos rigav ani boton raumhadev kahane ni badaimaken,ah raumhadev kahane ni,hatae rodon ani ahke butuhkan mama kahane ni. \v 3 Riga bohos ai naha dimake bae nahav ni kod yafako haser kimaken naha sadav ani dari make bae tae sadav yafako sado haser,nahav sadav ani homha fara sadimaken.
-=======
-\c 32 Mudranae barnake riga bohos ani sin bohos anni nahabadan \v 1 raja ni motanae dadahomae sin agado homae badai maken sin bohos sin raja ni, \v 2 yamos-yamos rigav ani boton raumhadev kahane ni badaimaken,ah raumhadev kahane ni,hatae rodon ani ahke butuhkan mama kahane ni. \v 3 Riga bohos ai naha dimake bae nahav ni kod yafako haser kimaken naha sadav ani dari make bae tae sadav yafako sado haser,nahav sadav ani homha fara sadimaken.
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:bahasatech.indotimur/saw_isa_text_reg.git
--- a/32/07.txt
+++ b/32/07.txt
@ -1,6 +1 @@
-<<<<<<< HEAD
 \v 7 Finan amjav rigav bae naha harav bae husar sef gagae,nahav sin roh ani savsavos rigav ke aefe faimaken naha finan bae savsavos rigav ani nahav ni naha wan ke favi nenae agadohomae modi maken. \v 8 Manae finan gaitar riga bohos ani,sin deder sin ke faimaken one sin deder maramae one rigav bohos ani dadaimaken. Yadem kamon ani badaike atav baidi maken
-=======
-\v 7 Finan amjav rigav bae naha harav bae husar sef gagae,nahav sin roh ani savsavos rigav ke aefe faimaken naha finan bae savsavos rigav ani nahav ni naha wan ke favi nenae agadohomae modi maken. \v 8 Manae finan gaitar riga bohos ani,sin deder sin ke faimaken one sin deder maramae one rigav bohos ani dadaimaken.
-Yadem kamon ani badaike atav baidi maken
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:bahasatech.indotimur/saw_isa_text_reg.git
--- a/33/01.txt
+++ b/33/01.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
 \v 1 Yagovo hanhaundev rigavo gini,okomae sin ke famonae ni arake rigav ke,gini aefan modimake ke gi ke aefe faimaken go ni hauwah sarmer modimake ke go ke hauwah sarmer fidaimkaen.
-=======
-\c 33 Myao Kodon ani E haisav kuasa ragimaken \v 1 Yagovo hanhaundev rigavo gini,okomae sin ke famonae ni arake rigav ke,gini aefan modimake ke gi ke aefe faimaken go ni hauwah sarmer modimake ke go ke hauwah sarmer fidaimkaen.
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:bahasatech.indotimur/saw_isa_text_reg.git
--- a/33/17.txt
+++ b/33/17.txt
@ -1,6 +1 @@
-<<<<<<< HEAD
 \v 17 Go kod ani raja faran e haisav faran grae go ni nahadimaken,argi kedava avhaim hatae tae gini naha dimaken. \v 18 Go hauwah duvrao nake nahadimaken tadan grae"Dahava amgidon rigav bae? \v 19 Ke gini one rigav ke nahandev yah kesaimaken,naha sin roh tae gini Nyam kesandev yah kesadimaken. Myao Kodon ani Yerusalem ke raumhaimaken
-=======
-\v 17 Go kod ani raja faran e haisav faran grae go ni nahadimaken,argi kedava avhaim hatae tae gini naha dimaken. \v 18 Go hauwah duvrao nake nahadimaken tadan grae"Dahava amgidon rigav bae? \v 19 Ke gini one rigav ke nahandev yah kesaimaken,naha sin roh tae gini Nyam kesandev yah kesadimaken.
-Myao Kodon ani Yerusalem ke raumhaimaken
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:bahasatech.indotimur/saw_isa_text_reg.git
--- a/34/01.txt
+++ b/34/01.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
 \v 1 Atahav ke sadimjaen enefaran haim-haim rigav gini uru aiyao ke barnake rigav ani naha dare daro masaden. \v 2 Myao Kodon ani amon e amon rigav ke,efae ni usadon ke fadaimakon,Efae ni usadimaken senefaran ani amon rigav haim ke.
-=======
-\c 34 Myao Kodon ani naha amon rigav ke usadimaken \v 1 Atahav ke sadimjaen enefaran haim-haim rigav gini uru aiyao ke barnake rigav ani naha dare daro masaden. \v 2 Myao Kodon ani amon e amon rigav ke,efae ni usadon ke fadaimakon,Efae ni usadimaken senefaran ani amon rigav haim ke.
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:bahasatech.indotimur/saw_isa_text_reg.git
--- a/35/01.txt
+++ b/35/01.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
 \v 1 Aiyao fohav anhag faran ke,anhag faran ke nahv nake nahav ni arakohomae onhai maraken,bunga soh kahane ni gwanae danama kahane ni. \v 2 Onhan faran naha ke fidai maken onhan grae kisgam grae Libanon anhag,Karmel der bae nahav ni Myao Kodon anhag onake nahanae adimaken Myao Kodon ke.
-=======
-\c 35 Myao Kodon ani e umat ke onhan faran \v 1 Aiyao fohav anhag faran ke,anhag faran ke nahv nake nahav ni arakohomae onhai maraken,bunga soh kahane ni gwanae danama kahane ni. \v 2 Onhan faran naha ke fidai maken onhan grae kisgam grae Libanon anhag,Karmel der bae nahav ni Myao Kodon anhag onake nahanae adimaken Myao Kodon ke.
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:bahasatech.indotimur/saw_isa_text_reg.git
--- a/36/01.txt
+++ b/36/01.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
 \v 1 Tahun ke empat belas utuv ovae ppemerintahan bae raja Hizkia ni,Sanherib raja Asyur ani Yehuda kota ke girgai fomhasir onakefasir. \v 2 Ke onake raja Asyur ani ah mon gaitar hovhan ke sinamtae kahane tavda gwansir Lakhis nake Yerusalem ke,pasukan rigav faran ani. \v 3 Onake Elyakim Hilkia tim istana ke mudranae bain ke,ke Sebna bendahara negara Yoah,Asaf tim,sekertasir hovhan raja Asyur ani tavda gwansir hovhan ke hanae kaudmasir.
-=======
-\c 36 Asyur rigav ani Yehuda ke girgai fomhasir ke \v 1 Tahun ke empat belas utuv ovae ppemerintahan bae raja Hizkia ni,Sanherib raja Asyur ani Yehuda kota ke girgai fomhasir onakefasir. \v 2 Ke onake raja Asyur ani ah mon gaitar hovhan ke sinamtae kahane tavda gwansir Lakhis nake Yerusalem ke,pasukan rigav faran ani. \v 3 Onake Elyakim Hilkia tim istana ke mudranae bain ke,ke Sebna bendahara negara Yoah,Asaf tim,sekertasir hovhan raja Asyur ani tavda gwansir hovhan ke hanae kaudmasir.
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:bahasatech.indotimur/saw_isa_text_reg.git
--- a/37/01.txt
+++ b/37/01.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
 \v 1 HIzkia ni darnae e baju bafhansir ke,asem ke rumhanae Myao Kodon af ke otasir \v 2 oanke raja tae Elyakim istana mudranae banadev hovhan Sebna bendahara negara,imam-imam nahav tae kain asem ke kaufarnae havansir ke Yesaya,Amos tim ke
-=======
-\c 37 Hizkia ni rigansir Myao Kodon ani naha gavus fanenae Eke \v 1 HIzkia ni darnae e baju bafhansir ke,asem ke rumhanae Myao Kodon af ke otasir \v 2 oanke raja tae Elyakim istana mudranae banadev hovhan Sebna bendahara negara,imam-imam nahav tae kain asem ke kaufarnae havansir ke Yesaya,Amos tim ke
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:bahasatech.indotimur/saw_isa_text_reg.git
--- a/37/03.txt
+++ b/37/03.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
 \v 3 Nahav tae Yesaya ke hanae agansir  ke,"Enenen Hizkia sin bae enatav bae,kod garaen atav,auwadon atav fanfadev atav manae ke haisav haser ken namo fanbae. \v 4 Ke Myao Kodon ani darsir komagani raja Asyur ani tavda gwansir hovhan ani darsir nenae,enatav bae rigadon roh tarfafem ba rigav nauri ke. .
-=======
-\v 3 Nahav tae Yesaya ke hanae agansir  ke,"Enenen Hizkia sin bae enatav bae,kod garaen atav,auwadon atav fanfadev atav manae ke haisav haser ken namo fanbae. \v 4 Ke Myao Kodon ani darsir komagani raja Asyur ani tavda gwansir hovhan ani darsir nenae,enatav bae rigadon roh tarfafem ba rigav nauri ke.
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:bahasatech.indotimur/saw_isa_text_reg.git
--- a/37/05.txt
+++ b/37/05.txt
@ -1,6 +1 @@
-<<<<<<< HEAD
 \v 5 Onake HIzkia karya gavus fadev rigav tae Yesaya ke hanae kaudmasir ke. \v 6 Yesaya tae sin nahav ke agansir ke ene;Hanae agadimajen gi tuan ke ene;Tadanom one sinamtai riga bohos ni agane sin ke darnae. \v 7 Sin bae ke nohov ni mao fidaimakon e mutuv fohav ke onake efae ni sin fae darnae e avhaim ke haimaken esgi e pedang ani rufaraimaken. One pasukan rigav faran Asyur tae Yerusalem ke monae hasir ke
-=======
-. \v 5 Onake HIzkia karya gavus fadev rigav tae Yesaya ke hanae kaudmasir ke. \v 6 Yesaya tae sin nahav ke agansir ke ene;Hanae agadimajen gi tuan ke ene;Tadanom one sinamtai riga bohos ni agane sin ke darnae. \v 7 Sin bae ke nohov ni mao fidaimakon e mutuv fohav ke onake efae ni sin fae darnae e avhaim ke haimaken esgi e pedang ani rufaraimaken.
-One pasukan rigav faran Asyur tae Yerusalem ke monae hasir ke
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:bahasatech.indotimur/saw_isa_text_reg.git
--- a/37/11.txt
+++ b/37/11.txt
@ -1,6 +1 @@
-<<<<<<< HEAD
 \v 11 Faetae gini darkomain avhaim-avhiam ke havanan maomain,hancur ken makomain haim etoh tae. \v 12 Naha alla gi ni nahav ke asnae gavus fakomain ne,Gozan ni,harani Rezef ani.Eden ani,ovae Tel-aser utuv ke banid \v 13 dava raja Hamat bae?Raja Arpad vae?Kota Sefarwain bae,Hena grae Iwa grae? Hizkia ni Myao Kodon ke rigansir ke
-=======
-\v 11 Faetae gini darkomain avhaim-avhiam ke havanan maomain,hancur ken makomain haim etoh tae. \v 12 Naha alla gi ni nahav ke asnae gavus fakomain ne,Gozan ni,harani Rezef ani.Eden ani,ovae Tel-aser utuv ke banid \v 13 dava raja Hamat bae?Raja Arpad vae?Kota Sefarwain bae,Hena grae Iwa grae?
-Hizkia ni Myao Kodon ke rigansir ke
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:bahasatech.indotimur/saw_isa_text_reg.git
--- a/37/19.txt
+++ b/37/19.txt
@ -1,6 +1 @@
-<<<<<<< HEAD
 \v 19 ke naha dewa-dewa gi tae yod ke taifa yaonsiren Asyur ani manae ovae enefaran bae riga bohos it ani maginsiren batu nake,tohod nake nahav bae Myao Kodon ani Myao Kodon bohos bae Govav. \v 20 One manae,Myao Kodon a nigiv gavus gavus fanam e it nake,one makotae ene dunia ke barnake rigav faran ani sin Myao Kodon Govav nahaden nenae. Allah ni HIzkia ni rigankir sin roh ke darsir ke
-=======
-\v 19 ke naha dewa-dewa gi tae yod ke taifa yaonsiren Asyur ani manae ovae enefaran bae riga bohos it ani maginsiren batu nake,tohod nake nahav bae Myao Kodon ani Myao Kodon bohos bae Govav. \v 20 One manae,Myao Kodon a nigiv gavus gavus fanam e it nake,one makotae ene dunia ke barnake rigav faran ani sin Myao Kodon Govav nahaden nenae.
-Allah ni HIzkia ni rigankir sin roh ke darsir ke
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:bahasatech.indotimur/saw_isa_text_reg.git
--- a/37/28.txt
+++ b/37/28.txt
@ -1,6 +1 @@
-<<<<<<< HEAD
 \v 28 Manae ke nohov ni nyam,go ni bake,Go ni sarimake ke,Go ni denae haimake ke,nohov ni tae nyam go ni maimake amon sef tae \v 29 Go amon bae no ke,ke go arkae sin bae no sadav ke hanae faranen,nohov ni ke go sae duv maramae ke rohone omae antar maimakon. Myao Kodon sin Hizkia ke agansir
-=======
-\v 28 Manae ke nohov ni nyam,go ni bake,Go ni sarimake ke,Go ni denae haimake ke,nohov ni tae nyam go ni maimake amon sef tae \v 29 Go amon bae no ke,ke go arkae sin bae no sadav ke hanae faranen,nohov ni ke go sae duv maramae ke rohone omae antar maimakon.
-Myao Kodon sin Hizkia ke agansir
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:bahasatech.indotimur/saw_isa_text_reg.git
--- a/37/35.txt
+++ b/37/35.txt
@ -1,6 +1 @@
-<<<<<<< HEAD
 \v 35 Nohov ni one kota ke mahomae askede tae nosgi no ke mahomae no fwi naha dadan nenae Daud maramae. Asyur e rigav ani ganhasir ke
-=======
-\v 35 Nohov ni one kota ke mahomae askede tae nosgi no ke mahomae no fwi naha dadan nenae Daud maramae.
-Asyur e rigav ani ganhasir ke
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:bahasatech.indotimur/saw_isa_text_reg.git
--- a/38/01.txt
+++ b/38/01.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
 \v 1 Atav fae ni badahomae baaigu Hizkia ni waidon kisir homon athav kisir,Nabi Yesaya Amos tim ani sin esnae agansir,eke:Ene aganid Myao Kodon sin ene nen,yahot bohos sin hanae aganid go ivar,hargyav ke go ni make waidon nake goni farado haser homimaken. \v 2 Hizkia ni one sin ke darnae reftav yawar amin ke gwanenae Myao Kodon ke rigankir. \v 3 Myao Kodon a Goni nyam nohov ni kafarmjaeni banamadan Go maramae nenae Hizkia ni sesar ramasir.
-=======
-\c 38 Hizkia waidon sin \v 1 Atav fae ni badahomae baaigu Hizkia ni waidon kisir homon athav kisir,Nabi Yesaya Amos tim ani sin esnae agansir,eke:Ene aganid Myao Kodon sin ene nen,yahot bohos sin hanae aganid go ivar,hargyav ke go ni make waidon nake goni farado haser homimaken. \v 2 Hizkia ni one sin ke darnae reftav yawar amin ke gwanenae Myao Kodon ke rigankir. \v 3 Myao Kodon a Goni nyam nohov ni kafarmjaeni banamadan Go maramae nenae Hizkia ni sesar ramasir.
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:bahasatech.indotimur/saw_isa_text_reg.git
--- a/38/07.txt
+++ b/38/07.txt
@ -1,6 +1 @@
-<<<<<<< HEAD
 \v 7 Efae ni tanda go maramae dadai maken,Myao Kodon ani agadimake sinbae sin kimaken aganae modo haser. \v 8 Nahanid nohov ni kod myao magidomakon atav nake Ahas ani nahanae didimaken. Hizkia ni tarafasir  kisgam
-=======
-\v 7 Efae ni tanda go maramae dadai maken,Myao Kodon ani agadimake sinbae sin kimaken aganae modo haser. \v 8 Nahanid nohov ni kod myao magidomakon atav nake Ahas ani nahanae didimaken.
-Hizkia ni tarafasir  kisgam
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:bahasatech.indotimur/saw_isa_text_reg.git
--- a/39/01.txt
+++ b/39/01.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
 \v 1 One tuv tae Baladan raja Babel ni sin surat ke ririnanae tavda gwasir Hizkia ke,efae ni darsir sin Hizkia ni waidon nake di dahomae faranae nenae. \v 2 Hizkia ni onhan grae der nenae dadahomae one kag rigav Babel nake hasir grae taifanae hanae e istana kerajaan fohav ke difarkir nahav ke ragi sangkir e banadev,harav dinadev,gudang kahane,senefaran kamon ani ragahomae arkomain nahav ke senefaran nahav ni nahansir,w banadev tae.
-=======
-\c 39 Rigav tavda gwansir Babel nake \v 1 One tuv tae Baladan raja Babel ni sin surat ke ririnanae tavda gwasir Hizkia ke,efae ni darsir sin Hizkia ni waidon nake di dahomae faranae nenae. \v 2 Hizkia ni onhan grae der nenae dadahomae one kag rigav Babel nake hasir grae taifanae hanae e istana kerajaan fohav ke difarkir nahav ke ragi sangkir e banadev,harav dinadev,gudang kahane,senefaran kamon ani ragahomae arkomain nahav ke senefaran nahav ni nahansir,w banadev tae.
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:bahasatech.indotimur/saw_isa_text_reg.git
--- a/40/01.txt
+++ b/40/01.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
 \v 1 Onhakimjaen No umat gini Myao Kodon sin ne neken; \v 2 Sin masomhaeni agadimjaen Yerusalem amon aifhwav bae monen,Haiyam bae tod man Myao Kodon ani
-=======
-\c 40 Hukuman Israel ani modimaken \v 1 Onhakimjaen No umat gini Myao Kodon sin ne neken; \v 2 Sin masomhaeni agadimjaen Yerusalem amon aifhwav bae monen,Haiyam bae tod man Myao Kodon ani
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:bahasatech.indotimur/saw_isa_text_reg.git
--- a/40/11.txt
+++ b/40/11.txt
@ -1,6 +1 @@
-<<<<<<< HEAD
 \v 11 Gembala ni domba mod ke farkema kahane,domba mod a haisav ani arkohaser dimake vae e it ani tarfa taigimhaimaken. Myao Kodon bae magindev ke Myao Kodon tae tadahomae arkedev
-=======
-\v 11 Gembala ni domba mod ke farkema kahane,domba mod a haisav ani arkohaser dimake vae e it ani tarfa taigimhaimaken.
-Myao Kodon bae magindev ke Myao Kodon tae tadahomae arkedev
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:bahasatech.indotimur/saw_isa_text_reg.git
--- a/40/15.txt
+++ b/40/15.txt
@ -1,6 +1 @@
-<<<<<<< HEAD
 \v 15 Haim-haim rigav faran bae ah sofo ke fomhama kahane,nahadimjaen pulau-pulau ke tarfake bae ididiv kahane. \v 16 Lebanon ke yod  famumaken kahane ni kimaken \v 17 Enefaran haim-haim raja faran bae okemae ni bain. Riga bohos ani Myao Kodon ke nyam nahanae fadevyah
-=======
-\v 15 Haim-haim rigav faran bae ah sofo ke fomhama kahane,nahadimjaen pulau-pulau ke tarfake bae ididiv kahane. \v 16 Lebanon ke yod  famumaken kahane ni kimaken \v 17 Enefaran haim-haim raja faran bae okemae ni bain.
-Riga bohos ani Myao Kodon ke nyam nahanae fadevyah
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:bahasatech.indotimur/saw_isa_text_reg.git
--- a/manifest.json
+++ b/manifest.json