diff --git a/01/13.txt b/01/13.txt index f3a0b29..b4593d4 100644 --- a/01/13.txt +++ b/01/13.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 13 Wen-aone wen-aone umma maero,kayone aima ko-uyaqka ya-uyaqkake-era yaimma wayuka naru-naruma tima-yikai yama yeti kumiqa tiwima kayikera ano karakomo kumi aimo awima kati-karainiq oro. \v 14 Mate tatakoni amuraqa akai aima taro-oro, mate kateko aimaa atauma yokaiye. -======= -\v 13 kumuyuq aainobake tiwiqmata Aniko yawikai marukata tiwaqnauma tikaraitaae.\v 14 Itogo-ni Aniko ketaai kumiq aimma mama paaena, ketama yauweqma tiwikaitaae. ->>>>>>> fd470173941651a44ed72833976a0ed39cb6829e +\v 13 kumuyuq aainobake tiwiqmata Aniko yawikai marukata tiwaqnauma tikaraitaae. \v 14 Itogo-ni Aniko ketaai kumiq aimma mama paaena, ketama yauweqma tiwikaitaae. \ No newline at end of file diff --git a/01/18.txt b/01/18.txt index fdf13c0..4496e90 100644 --- a/01/18.txt +++ b/01/18.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 18 Ketiwaimati aamenapaq aranamaa maero,aano karakoni aurakaqa kana aine. \v 19 Waayanane,ketinamaqa iraqoni keumayikera,imaa aano naima timayikaro. \v 20 Iyaapo nane,mate-tatapike ketinobo yuti aama itaro. Minaitaba aano karaqko aamuqa kemaraiye. -======= -\v 18 Monoq nama Itu-ni auyaawapoana, wema monq naakoni aqnone. Ituma aaimma ataarai poana, puyibike aqnaabaq-yataaqa itouraiye. \v 19 Maqte tataaqa aanikonna-boana, wema kawaa-iniye, ten Itogo amuqa makaiye. Itu-ni awiqkaq maqte tataaqa maibo, wekaq tiruno-tero. \v 20 Itu-ni naaema kaapaq yaataqke kukai-taba, abowama, kateko mai-aaimma mama paaq-uraiye. ->>>>>>> fd470173941651a44ed72833976a0ed39cb6829e +\v 18 Monoq nama Itu-ni auyaawapoana, wema monq naakoni aqnone. Ituma aaimma ataarai poana, puyibike aqnaabaq-yataaqa itouraiye. \v 19 Maqte tataaqa aanikonna-boana, wema kawaa-iniye, ten Itogo amuqa makaiye. Itu-ni awiqkaq maqte tataaqa maibo, wekaq tiruno-tero. \v 20 Itu-ni naaema kaapaq yaataqke kukai-taba, abowama, kateko mai-aaimma mama paaq-uraiye. \ No newline at end of file diff --git a/01/21.txt b/01/21.txt index 60510fb..caccd28 100644 --- a/01/21.txt +++ b/01/21.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 21 Iyapo anaa imaa yiwaguo,ketibo,inataa imaa itama taiotao. - \v 22 Mayai wayukaama,mamarabi karakayukati amaa wararo yeti yuyanakaq mateniq oro,auraka mayai mayai yana amuqo maranitaba imaa oro. Arai narukake aano kaarama ikati umakera mayaimaa mayaaro. \v 23 Noitatario ineoea aakona tuyanakake aano karakaq mayai mayaro. Imaa mamarabi kaayu karaa mayaimo maya tekanoro. -======= -\v 21 Mora taoqa eni auyanakoma tawiqo-itaama, maa-maraabi aaimma taroq-onnamo, weni naamuro-aure, Itogo-kaq naamuq naqa aurainone. \v 22 Mirai-manibo, weni auyaawa-taba I'ma ten, kupuqmena koikaake, turuno-aaiko paaq-uraiye. Abo Itu maminna araatake aminimma, aamma-aummakai-karaq, aubi ima maraina, wema aqnaabaq maraina wekaq noraq urainna aaimma tagaainone. \v 23 Aqkonna auyaana-kaq wiq-wiq emo, aaimma ataama aqkonna-uwo. Mora akaq auyanamma itare i-taana monoqa I'ma yuwe kowao. Itu taroq-urai kayukama maraa-bi maunnatama, Mami monoq-aaiko timatimiqma tagaaraitaae. Kema Poroma monoq mayai-naaqa maaeq mataunna monoq-aaiko. ->>>>>>> fd470173941651a44ed72833976a0ed39cb6829e +\v 21 Mora taoqa eni auyanakoma tawiqo-itaama, maa-maraabi aaimma taroq-onnamo, weni naamuro-aure, Itogo-kaq naamuq naqa aurainone. \v 22 Mirai-manibo, weni auyaawa-taba I'ma ten, kupuqmena koikaake, turuno-aaiko paaq-uraiye. Abo Itu maminna araatake aminimma, aamma-aummakai-karaq, aubi ima maraina, wema aqnaabaq maraina wekaq noraq urainna aaimma tagaainone. \v 23 Aqkonna auyaana-kaq wiq-wiq emo, aaimma ataama aqkonna-uwo. Mora akaq auyanamma itare i-taana monoqa I'ma yuwe kowao. Itu taroq-urai kayukama maraa-bi maunnatama, Mami monoq-aaiko timatimiqma tagaaraitaae. Kema Poroma monoq mayai-naaqa maaeq mataunna monoq-aaiko. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 19fc34f..532be14 100644 --- a/manifest.json +++ b/manifest.json @@ -46,7 +46,10 @@ "01-07", "01-09", "01-11", + "01-13", "01-15", + "01-18", + "01-21", "01-24", "01-28", "02-title",