diff --git a/02/27.txt b/02/27.txt index 1299959..2e07b9f 100644 --- a/02/27.txt +++ b/02/27.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 27 nai, Simeon rhoh mi bait Allah i tuntun rhuh suci, waktu Yusuf dekket Maria merhembah Isa anak mbarha i mi Bait Allah lako melaksanaken mi Isa kade sini tentuken merhkite hukum taurhat. \v 28 Enggo kecca i, i dokong Simeon mo Anak mbarha i janah memuji Allah, nina mo \v 29 "badendarhi, ale Tuhan" naing mo nemu i Izinken kona pelayanan-Mu laus bagus dame, bage Firhman-Mu dekket jehma mendahi Ia -======= -\v 27 nai, Simeon rhoh mi bait Allah i tuntun rhuh suci, waktu Yusuf dekket Maria merhembah Isa anak mbarha i mi Bait Allah lako melaksanaken mi Isa kade sini tentuken merhkite hukum taurhat. \v 28 Enggo kecca i, i dokong Simeon mo Anak mbarha i janah memuji Allah, nina mo \v 29 "badendarhi, ale Tuhan" naing mo nemu i Izinken kona pelayanan-Mu laus bagus dame, bage Firhman-Mu ->>>>>>> 2012f622603d858dabe40e1cf800d03a52585c62 +\v 27 nai, Simeon rhoh mi bait Allah i tuntun rhuh suci, waktu Yusuf dekket Maria merhembah Isa anak mbarha i mi Bait Allah lako melaksanaken mi Isa kade sini tentuken merhkite hukum taurhat. \v 28 Enggo kecca i, i dokong Simeon mo Anak mbarha i janah memuji Allah, nina mo \v 29 "badendarhi, ale Tuhan" naing mo nemu i Izinken kona pelayanan-Mu laus bagus dame, bage Firhman-Mu dekket jehma mendahi Ia \ No newline at end of file diff --git a/02/36.txt b/02/36.txt index 68e24b4..be98378 100644 --- a/02/36.txt +++ b/02/36.txt @@ -1,6 +1,2 @@ -<<<<<<< HEAD \v 36 Lot mang ngo isis hada kalak nabiah gelarh Hana anak Fanuel i suku Asyer nai, enggo ng tua kalon ia pitu tahun ngo keca dekah na ia nggeluh rhebak dekket laki na enggo kecca kalak i menikah \v 37 janah jadi janda ngo ia sampe waluh puluh empat esia na oda ngo perhnah i tadingken Bait Allah, tapi merhibadah maharh dekket berhngin dekket merpuasa janah merhdoa. \v 38 I pas waktu ni, rhoh mo hana janah mengucap sukurh ngo ia mi Allah dekket mencerhitaken tentang Isa be rhatana kalak si memema-mema penebusen Yerhusalem. -Yusuf dekket Maria Laus Nazarhet -======= -\v 36 Lot mang ngo isis hada kalak nabiah gelarh Hana anak Fanuel i suku Asyer nai, enggo ng tua kalon ia pitu tahun ngo keca dekah na ia nggeluh rhebak dekket laki na enggo kecca kalak i menikah \v 37 janah jadi janda ngo ia sampe waluh puluh empat esia na oda ngo perhnah i tadingken Bait Allah, tapi merhibadah maharh dekket berhngin dekket merpuasa janah merhdoa. \v 38 I pas waktu ni, rhoh mo hana janah mengucap sukurh ngo ia mi Allah dekket mencerhitaken tentang Isa be rhatana kalak si memema-mema penebusen Yerhusalem. ->>>>>>> 2012f622603d858dabe40e1cf800d03a52585c62 +Yusuf dekket Maria Laus Nazarhet \ No newline at end of file diff --git a/02/39.txt b/02/39.txt index 5ca9621..983a4a9 100644 --- a/02/39.txt +++ b/02/39.txt @@ -1,6 +1,2 @@ -<<<<<<< HEAD \v 39 enggo kecca i baingken Yusuf dekket Maria sesue hukum Tuhan, mulak mo kalak i mi Galilea, kota asal kalak i, imo Nazaret. \v 40 Anak i pe enggo semakin beghah kuat, i domi hikmat, janah i berhkati Allah ngo ia. -Isa i Bait Allah -======= -\v 39 enggo kecca i baingken Yusuf dekket Maria sesue hukum Tuhan, mulak mo kalak i mi Galilea, kota asal kalak i, imo Nazaret. \v 40 Anak i pe enggo semakin beghah kuat, i domi hikmat, janah i berhkati Allah ngo ia. ->>>>>>> 2012f622603d858dabe40e1cf800d03a52585c62 +Isa i Bait Allah \ No newline at end of file diff --git a/02/51.txt b/02/51.txt index 5f39478..96a9159 100644 --- a/02/51.txt +++ b/02/51.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 51 Nai, laus mo Isa mi Nazaret dekket menurhuti kalak i tapi, i simpan cecek-Na ngo i bages ate na kade sini dokken Isa mendahi kalak i. \v 52 Semakin behgang ngo Isa dekket semakin bijaksana. Janah semakin kelleng ngo ate Allah -======= -\v 51 Nai, laus mo Isa mi Nazaret dekket menurhuti kalak i tapi, i simpan cecek-Na ngo i bages ate na kade sini dokken Isa mendahi kalak i. \v 52 Semakin behgang ngo Isa dekket semakin bijaksana. Janah semakin kelleng ngo ate Allah dekket jehma mendahi Ia. ->>>>>>> 2012f622603d858dabe40e1cf800d03a52585c62 +\v 51 Nai, laus mo Isa mi Nazaret dekket menurhuti kalak i tapi, i simpan cecek-Na ngo i bages ate na kade sini dokken Isa mendahi kalak i. \v 52 Semakin behgang ngo Isa dekket semakin bijaksana. Janah semakin kelleng ngo ate Allah \ No newline at end of file diff --git a/manifest.json b/manifest.json index 9b52871..ec53a0e 100644 --- a/manifest.json +++ b/manifest.json @@ -78,12 +78,17 @@ "02-15", "02-17", "02-21", + "02-22", "02-25", + "02-27", "02-30", "02-33", + "02-36", + "02-39", "02-41", "02-45", "02-48", + "02-51", "03-title", "03-03", "03-04",