diff --git a/01/01.txt b/01/01.txt index 2caa2a2..bd203cc 100644 --- a/01/01.txt +++ b/01/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 1 \v 1 Vaingi vasoya uekaa umopangilio mareghetrio uhusu masuala neaghodeywa moghatre itru, \v 2 Ginya vagufie,nechu ufuma mwandio nemasudanga va miho na atromami va ketrii. \v 3 Oii nane no, baada oravaa gwa umakini mwandio wa mantu ayai ong'e ufuma mwandio -naona neguja gwane uguhadea umofangileo wayo- mohesimewa ino Theofilo. \v 4 Ili kwamba udahe umanya trutri aa mantu newafundisiywe. -======= -\v 1 Vaingi vasoya uekaa umopangilio mareghetrio uhusu masuala neaghodeywa moghatre itru, \v 2 Ginya vagufie,nechu ufuma mwandio nemasudanga va miho na atromami va ketrii. \v 3 Oii nane no, baada oravaa gwa umakini mwandio wa mantu ayai ong'e ufuma mwandio -naona neguja gwane uguhadea umofangileo wayo- mohesimewa ino Theofilo. \v 4 Ili kwamba udahe umanya trutri aa mantu newafundisiywe. ->>>>>>> 18dc89741972e14b21b9a47671c402dfed1ab521 +\c 1 \v 1 Vaingi vasoya uekaa umopangilio mareghetrio uhusu masuala neaghodeywa moghatre itru, \v 2 Ginya vagufie,nechu ufuma mwandio nemasudanga va miho na atromami va ketrii. \v 3 Oii nane no, baada oravaa gwa umakini mwandio wa mantu ayai ong'e ufuma mwandio -naona neguja gwane uguhadea umofangileo wayo- mohesimewa ino Theofilo. \v 4 Ili kwamba udahe umanya trutri aa mantu newafundisiywe. \ No newline at end of file diff --git a/02/01.txt b/02/01.txt index 342bb3e..4ef34af 100644 --- a/02/01.txt +++ b/02/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 2 \v 1 Fanui gwamatriku asaa,ahendeka kwamba Kaisari Agusto afunye ghabari kwamba antu vevarie sensa aa antu vong'e nevodova uguuremi. \v 2 Eyei nare sensa aa mwandio neahendekie ighondo Krenio nare gavana wa Siria. \v 3 Momontu waenda umujini uandikiswa sensa. -======= -\v 1 Fanui gwamatriku asaa,ahendeka kwamba Kaisari Agusto afunye ghabari kwamba antu vevarie sensa aa antu vong'e nevodova uguuremi. \v 2 Eyei nare sensa aa mwandio neahendekie ighondo Krenio nare gavana wa Siria. \v 3 Momontu waenda umujini uandikiswa sensa. ->>>>>>> 18dc89741972e14b21b9a47671c402dfed1ab521 +\c 2 \v 1 Fanui gwamatriku asaa,ahendeka kwamba Kaisari Agusto afunye ghabari kwamba antu vevarie sensa aa antu vong'e nevodova uguuremi. \v 2 Eyei nare sensa aa mwandio neahendekie ighondo Krenio nare gavana wa Siria. \v 3 Momontu waenda umujini uandikiswa sensa. \ No newline at end of file diff --git a/03/01.txt b/03/01.txt index c608d3c..ef42fd0 100644 --- a/03/01.txt +++ b/03/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 3 \v 1 Fanui, gwa ighondo rautrawala wama Kaisari Tiberia, ighondo ramaPotio Pilato nare gavana wa Uyahudi, Herode nare mokuu wa mokoa wa Galilaya, na Filipo monyadughu wakwe nare mokuu wa mokoa wa Iturea na Trakoniti, na Lisania nare mokuu wakoa wa Abilene, \v 2 na ighondo wa ukuhani wa mokuu wa Anasi na Kayafa, Ukhani wa MUngu ugamojea Yohana mwana wa Zakaria, ugijangwa. -======= -\v 1 Fanui, gwa ighondo rautrawala wama Kaisari Tiberia, ighondo ramaPotio Pilato nare gavana wa Uyahudi, Herode nare mokuu wa mokoa wa Galilaya, na Filipo monyadughu wakwe nare mokuu wa mokoa wa Iturea na Trakoniti, na Lisania nare mokuu wakoa wa Abilene, \v 2 na ighondo wa ukuhani wa mokuu wa Anasi na Kayafa, Ukhani wa MUngu ugamojea Yohana mwana wa Zakaria, ugijangwa. ->>>>>>> 18dc89741972e14b21b9a47671c402dfed1ab521 +\c 3 \v 1 Fanui, gwa ighondo rautrawala wama Kaisari Tiberia, ighondo ramaPotio Pilato nare gavana wa Uyahudi, Herode nare mokuu wa mokoa wa Galilaya, na Filipo monyadughu wakwe nare mokuu wa mokoa wa Iturea na Trakoniti, na Lisania nare mokuu wakoa wa Abilene, \v 2 na ighondo wa ukuhani wa mokuu wa Anasi na Kayafa, Ukhani wa MUngu ugamojea Yohana mwana wa Zakaria, ugijangwa. \ No newline at end of file diff --git a/04/01.txt b/04/01.txt index 5a59071..13e07cf 100644 --- a/04/01.txt +++ b/04/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 4 \v 1 Na, Yesu newijue Mwahu Mweru, agasuka ufuma mongo Jordani, naagatrongerwa Mwahu ujjangwani \v 2 gwa matriku arobaini, na kuko agasoiswa na ibilisi. Ighondo resee atrina lia ntu, na ighondo ramwesio agatregheya njaa. -======= -\v 1 Na, Yesu newijue Mwahu Mweru, agasuka ufuma mongo Jordani, naagatrongerwa Mwahu ujjangwani \v 2 gwa matriku arobaini, na kuko agasoiswa na ibilisi. Ighondo resee atrina lia ntu, na ighondo ramwesio agatregheya njaa. ->>>>>>> 18dc89741972e14b21b9a47671c402dfed1ab521 +\c 4 \v 1 Na, Yesu newijue Mwahu Mweru, agasuka ufuma mongo Jordani, naagatrongerwa Mwahu ujjangwani \v 2 gwa matriku arobaini, na kuko agasoiswa na ibilisi. Ighondo resee atrina lia ntu, na ighondo ramwesio agatregheya njaa. \ No newline at end of file diff --git a/05/01.txt b/05/01.txt index 3fd17f5..e9855a0 100644 --- a/05/01.txt +++ b/05/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 5 \v 1 Antu vegamuzunguka Yesu veghembe ughani wa Mungu, nechu nare wemwkie umpeo aa iziwa Genesareti. \v 2 Agaona mashua ivere yompeo aa iziwa. Avuvi nare vafwaya vuoya nyavu yawe. \v 3 Yesu wakea umashua emwedu, nare ama Simoni na wamuomba etrowe umaje kwengi kidogo na muji neutriketri amje. Nawaeghaa wafundisia ufuma uu mashua. -======= -\v 1 Antu vegamuzunguka Yesu veghembe ughani wa Mungu, nechu nare wemwkie umpeo aa iziwa Genesareti. \v 2 Agaona mashua ivere yompeo aa iziwa. Avuvi nare vafwaya vuoya nyavu yawe. \v 3 Yesu wakea umashua emwedu, nare ama Simoni na wamuomba etrowe umaje kwengi kidogo na muji neutriketri amje. Nawaeghaa wafundisia ufuma uu mashua. ->>>>>>> 18dc89741972e14b21b9a47671c402dfed1ab521 +\c 5 \v 1 Antu vegamuzunguka Yesu veghembe ughani wa Mungu, nechu nare wemwkie umpeo aa iziwa Genesareti. \v 2 Agaona mashua ivere yompeo aa iziwa. Avuvi nare vafwaya vuoya nyavu yawe. \v 3 Yesu wakea umashua emwedu, nare ama Simoni na wamuomba etrowe umaje kwengi kidogo na muji neutriketri amje. Nawaeghaa wafundisia ufuma uu mashua. \ No newline at end of file diff --git a/06/01.txt b/06/01.txt index 96aa94f..7721d88 100644 --- a/06/01.txt +++ b/06/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 6 \v 1 Yesu nare ukere umughunda wa nafaka na anafunzi akwe nare vovuna masuke, vayasugua sugua umeghono awe valia nafaka. \v 2 Lakini baadhi amafarisayo vahanya, "Nesoko eke mohenda intu nentihalale geseria urehenda itriku ra sabato"? -======= -\v 1 Yesu nare ukere umughunda wa nafaka na anafunzi akwe nare vovuna masuke, vayasugua sugua umeghono awe valia nafaka. \v 2 Lakini baadhi amafarisayo vahanya, "Nesoko eke mohenda intu nentihalale geseria urehenda itriku ra sabato"? ->>>>>>> 18dc89741972e14b21b9a47671c402dfed1ab521 +\c 6 \v 1 Yesu nare ukere umughunda wa nafaka na anafunzi akwe nare vovuna masuke, vayasugua sugua umeghono awe valia nafaka. \v 2 Lakini baadhi amafarisayo vahanya, "Nesoko eke mohenda intu nentihalale geseria urehenda itriku ra sabato"? \ No newline at end of file diff --git a/front/title.txt b/front/title.txt index 8517a75..1489458 100644 --- a/front/title.txt +++ b/front/title.txt @@ -1,9 +1 @@ -<<<<<<< HEAD -<<<<<<< HEAD -Luka -======= -Luke ->>>>>>> 18dc89741972e14b21b9a47671c402dfed1ab521 -======= -Luke ->>>>>>> af4139759824b16e8a1af688121d7cdad780c5f8 +Luka \ No newline at end of file diff --git a/manifest.json b/manifest.json index 15f5548..6f82301 100644 --- a/manifest.json +++ b/manifest.json @@ -38,7 +38,9 @@ "jerry" ], "finished_chunks": [ + "front-title", "01-title", + "01-01", "01-05", "01-08", "01-11", @@ -69,6 +71,7 @@ "01-78", "01-80", "02-title", + "02-01", "02-04", "02-06", "02-08", @@ -89,6 +92,7 @@ "02-48", "02-51", "03-title", + "03-01", "03-03", "03-04", "03-05", @@ -109,6 +113,7 @@ "03-33", "03-36", "04-title", + "04-01", "04-03", "04-05", "04-08", @@ -128,6 +133,7 @@ "04-40", "04-42", "05-title", + "05-01", "05-04", "05-08", "05-12", @@ -144,6 +150,7 @@ "05-36", "05-37", "06-title", + "06-01", "06-03", "06-06", "06-09", @@ -166,6 +173,139 @@ "06-45", "06-46", "06-49", + "07-06", + "07-09", + "07-11", + "07-16", + "07-18", + "07-21", + "07-24", + "07-27", + "07-29", + "07-31", + "07-33", + "07-36", + "07-39", + "07-41", + "07-44", + "07-46", + "07-48", + "08-title", + "08-01", + "08-04", + "08-07", + "08-09", + "08-11", + "08-14", + "08-16", + "08-19", + "08-22", + "08-24", + "08-26", + "08-28", + "08-30", + "08-32", + "08-34", + "08-36", + "08-38", + "08-40", + "08-43", + "08-45", + "08-47", + "08-49", + "08-51", + "08-54", + "09-title", + "09-01", + "09-03", + "09-05", + "09-07", + "09-10", + "09-12", + "09-15", + "09-18", + "09-20", + "09-23", + "09-26", + "09-28", + "09-30", + "09-32", + "09-34", + "09-37", + "09-41", + "09-43", + "09-46", + "09-49", + "09-51", + "09-54", + "09-57", + "09-59", + "09-61", + "10-title", + "10-01", + "10-03", + "10-05", + "10-08", + "10-10", + "10-13", + "10-16", + "10-17", + "10-21", + "10-22", + "10-23", + "10-25", + "10-29", + "10-31", + "10-33", + "10-36", + "10-38", + "10-40", + "11-title", + "11-01", + "11-02", + "11-03", + "11-05", + "11-09", + "11-11", + "11-14", + "11-16", + "11-18", + "11-21", + "11-24", + "11-27", + "11-29", + "11-31", + "11-32", + "11-33", + "11-37", + "11-39", + "11-42", + "11-43", + "11-45", + "11-47", + "11-49", + "11-52", + "12-title", + "12-01", + "12-02", + "12-04", + "12-06", + "12-08", + "12-11", + "12-13", + "12-16", + "12-20", + "12-22", + "12-24", + "12-27", + "12-29", + "12-31", + "12-33", + "12-35", + "12-37", + "12-39", + "12-41", + "12-45", "13-title", "13-01", "13-04", @@ -369,139 +509,6 @@ "24-45", "24-48", "24-50", - "24-52", - "07-06", - "07-09", - "07-11", - "07-16", - "07-18", - "07-21", - "07-24", - "07-27", - "07-29", - "07-31", - "07-33", - "07-36", - "07-39", - "07-41", - "07-44", - "07-46", - "07-48", - "08-title", - "08-01", - "08-04", - "08-07", - "08-09", - "08-11", - "08-14", - "08-16", - "08-19", - "08-22", - "08-24", - "08-26", - "08-28", - "08-30", - "08-32", - "08-34", - "08-36", - "08-38", - "08-40", - "08-43", - "08-45", - "08-47", - "08-49", - "08-51", - "08-54", - "09-title", - "09-01", - "09-03", - "09-05", - "09-07", - "09-10", - "09-12", - "09-15", - "09-18", - "09-20", - "09-23", - "09-26", - "09-28", - "09-30", - "09-32", - "09-34", - "09-37", - "09-41", - "09-43", - "09-46", - "09-49", - "09-51", - "09-54", - "09-57", - "09-59", - "09-61", - "10-title", - "10-01", - "10-03", - "10-05", - "10-08", - "10-10", - "10-13", - "10-16", - "10-17", - "10-21", - "10-22", - "10-23", - "10-25", - "10-29", - "10-31", - "10-33", - "10-36", - "10-38", - "10-40", - "11-title", - "11-01", - "11-02", - "11-03", - "11-05", - "11-09", - "11-11", - "11-14", - "11-16", - "11-18", - "11-21", - "11-24", - "11-27", - "11-29", - "11-31", - "11-32", - "11-33", - "11-37", - "11-39", - "11-42", - "11-43", - "11-45", - "11-47", - "11-49", - "11-52", - "12-title", - "12-01", - "12-02", - "12-04", - "12-06", - "12-08", - "12-11", - "12-13", - "12-16", - "12-20", - "12-22", - "12-24", - "12-27", - "12-29", - "12-31", - "12-33", - "12-35", - "12-37", - "12-39", - "12-41", - "12-45" + "24-52" ] } \ No newline at end of file