From d21d7331ecd87eb2228be505aa73eb00835b3027 Mon Sep 17 00:00:00 2001 From: tsDesktop Date: Thu, 25 Apr 2024 04:48:54 -0700 Subject: [PATCH] Thu Apr 25 2024 04:48:52 GMT-0700 (Pacific Daylight Time) --- 01/title.txt | 6 +- 04/01.txt | 6 +- 04/04.txt | 6 +- 04/06.txt | 6 +- 04/09.txt | 6 +- manifest.json | 227 ++++++++++++++++++++++++++------------------------ 6 files changed, 121 insertions(+), 136 deletions(-) diff --git a/01/title.txt b/01/title.txt index a501d3e..e878d56 100644 --- a/01/title.txt +++ b/01/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -Icipandwa -======= -Icipandwa 1 ->>>>>>> f6eeeff896d963d327d3b1717d331bbb4652b6e0 +Icipandwa 1 \ No newline at end of file diff --git a/04/01.txt b/04/01.txt index 024acdd..b06b39c 100644 --- a/04/01.txt +++ b/04/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 4 \v 1 Nomba Yesu aishibe ukuti aba Faliseyo nabomfwa ai Yesu acita no kubatisha, abasambi abengiukucila Yoani \v 2 (nangu line Yesu talikubatisha umwine kamofe abasambi abakwe), \v 3 Afumineko ku Yudea no kubwekelamo ku Galileya. -======= -\c 4 \v 1 Nomba Yesu aishibo kuti abaFaliseli nabomfwa ai Yesu acita nokubatisha abasambi abengi ukucila Yoani \v 2 (lelo Yesu umwine talebatisha, kano fe abasambi), \v 3 Afumineko ku Yudea nokubwelelamo ku Galileya. ->>>>>>> f6eeeff896d963d327d3b1717d331bbb4652b6e0 +\c 4 \v 1 Nomba Yesu aishibe ukuti aba Faliseyo nabomfwa ai Yesu acita no kubatisha, abasambi abengiukucila Yoani \v 2 (nangu line Yesu talikubatisha umwine kamofe abasambi abakwe), \v 3 Afumineko ku Yudea no kubwekelamo ku Galileya. \ No newline at end of file diff --git a/04/04.txt b/04/04.txt index 51580bf..a4b3b03 100644 --- a/04/04.txt +++ b/04/04.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 4 Awe ali nokupita mu Samaria \v 5 eco afika ku mushi wa Samaria, uwaitwa Sukuri, mu pepi ne me mpanga yakwa Yakobo iyo apele umwana wakwe Yosefu. -======= -\v 4 Awe ali nokupita mu Samaria. \v 5 Eco afikile ku munshi wa Samaria, mupepi ne mpanga yakwa Yakobo iyo apele umwana wakwe Yosefe. ->>>>>>> f6eeeff896d963d327d3b1717d331bbb4652b6e0 +\v 4 Awe ali nokupita mu Samaria \v 5 eco afika ku mushi wa Samaria, uwaitwa Sukuri, mu pepi ne me mpanga yakwa Yakobo iyo apele umwana wakwe Yosefu. \ No newline at end of file diff --git a/04/06.txt b/04/06.txt index 9301538..77f8057 100644 --- a/04/06.txt +++ b/04/06.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 6 Elo mwali ne cishima cakwa Yakobo , Yesu alinakile pamulandu wa lwendo ulwalepele alimo no kwikala mupepi na kasuba pa kati. \v 7 Umwanakashi alishishile mukutapa amenshi, elo Yesu amweba ai, ''Mpelako amenshi amenshi ayakuti nwe.'' \v 8 Apo ninshi abasambi bakwe bale mukushita ifilyo mu mushi. -======= -\v 6 Elo mwali ne cishima cakwa Yakobo, Yesu alinakile pamulandu wa lwendo ulalepele alimo nokwikala mupepi ne cishima. Inshita yali mupepi pa kati. \v 7 Umwanakashi alishile mukutapa amenshi, elo Yesu amweba ai mpelako amenshi ayakuti nwe.'' \v 8 Apo ninshi abasambi bakwe bele mukushita ifilyo mu mushi. ->>>>>>> f6eeeff896d963d327d3b1717d331bbb4652b6e0 +\v 6 Elo mwali ne cishima cakwa Yakobo , Yesu alinakile pamulandu wa lwendo ulwalepele alimo no kwikala mupepi na kasuba pa kati. \v 7 Umwanakashi alishishile mukutapa amenshi, elo Yesu amweba ai, ''Mpelako amenshi amenshi ayakuti nwe.'' \v 8 Apo ninshi abasambi bakwe bale mukushita ifilyo mu mushi. \ No newline at end of file diff --git a/04/09.txt b/04/09.txt index ecf5baa..4763913 100644 --- a/04/09.txt +++ b/04/09.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 9 ELo umwanakashi umwina Samaria amweba ai, ''Nga cinshi iwe, we mu Yuda mu Yuda , ukonombela amenshi yakunwa?" pantu aba Yuda tabalekumfwana na bena Samaria. \v 10 Yesu asosele kumwanakashi ai, '' Nga wishibe icabupe cakwa Lesa, no uletila kuli nebo nao ngawa mulomba , ngaa kupela amenshi yamweo .'' -======= -\v 9 Elo umwanakashi umwina Samaria, amweba ai, ''Nga cinshi iwe, we mu Yuda, ulelombela amenshi yakunwa'' Pantu aba Yuda nabena fyalo tabendela pamo. \v 10 Yesu asosele ku mwanakashi ai, ''Uwishibe cabupe cakwa Lesa, no uletila kuli iwe, 'Mpelako nwe,' nao nga wamulomba, nga akupela amenshi yamweo.'' ->>>>>>> f6eeeff896d963d327d3b1717d331bbb4652b6e0 +\v 9 ELo umwanakashi umwina Samaria amweba ai, ''Nga cinshi iwe, we mu Yuda mu Yuda , ukonombela amenshi yakunwa?" pantu aba Yuda tabalekumfwana na bena Samaria. \v 10 Yesu asosele kumwanakashi ai, '' Nga wishibe icabupe cakwa Lesa, no uletila kuli nebo nao ngawa mulomba , ngaa kupela amenshi yamweo .'' \ No newline at end of file diff --git a/manifest.json b/manifest.json index 8fb3b5f..30ee448 100644 --- a/manifest.json +++ b/manifest.json @@ -43,6 +43,27 @@ ], "finished_chunks": [ "front-title", + "01-title", + "01-01", + "01-04", + "01-06", + "01-09", + "01-10", + "01-12", + "01-14", + "01-16", + "01-19", + "01-22", + "01-24", + "01-26", + "01-29", + "01-32", + "01-35", + "01-37", + "01-40", + "01-43", + "01-46", + "01-49", "03-title", "03-01", "03-03", @@ -60,6 +81,52 @@ "03-31", "03-34", "04-title", + "04-01", + "04-04", + "04-06", + "04-09", + "04-11", + "04-13", + "04-15", + "04-17", + "04-19", + "04-21", + "04-23", + "04-25", + "04-27", + "04-28", + "04-31", + "04-34", + "04-37", + "04-39", + "04-41", + "04-43", + "04-46", + "04-48", + "04-51", + "04-53", + "05-title", + "05-01", + "05-05", + "05-07", + "05-09", + "05-10", + "05-12", + "05-14", + "05-16", + "05-19", + "05-21", + "05-24", + "05-25", + "05-26", + "05-28", + "05-30", + "05-33", + "05-36", + "05-39", + "05-41", + "05-43", + "05-45", "06-title", "06-01", "06-04", @@ -156,44 +223,6 @@ "11-51", "11-54", "11-56", - "19-title", - "19-01", - "19-04", - "19-07", - "19-10", - "19-12", - "19-14", - "19-17", - "19-19", - "19-21", - "19-23", - "19-25", - "19-28", - "19-31", - "19-34", - "19-36", - "19-38", - "19-40", - "01-01", - "01-04", - "01-06", - "01-09", - "01-10", - "01-12", - "01-14", - "01-16", - "01-19", - "01-22", - "01-24", - "01-26", - "01-29", - "01-32", - "01-35", - "01-37", - "01-40", - "01-43", - "01-46", - "01-49", "12-title", "12-01", "12-04", @@ -229,6 +258,20 @@ "14-25", "14-28", "14-30", + "15-title", + "15-01", + "15-03", + "15-05", + "15-08", + "15-10", + "15-12", + "15-14", + "15-16", + "15-18", + "15-20", + "15-23", + "15-26", + "16-title", "17-title", "17-01", "17-03", @@ -241,6 +284,40 @@ "17-22", "17-24", "17-25", + "18-title", + "18-01", + "18-04", + "18-06", + "18-08", + "18-10", + "18-12", + "18-15", + "18-17", + "18-19", + "18-22", + "18-25", + "18-28", + "18-31", + "18-33", + "18-36", + "19-title", + "19-01", + "19-04", + "19-07", + "19-10", + "19-12", + "19-14", + "19-17", + "19-19", + "19-21", + "19-23", + "19-25", + "19-28", + "19-31", + "19-34", + "19-36", + "19-38", + "19-40", "20-01", "20-03", "20-06", @@ -265,78 +342,6 @@ "21-19", "21-20", "21-22", - "21-24", - "04-11", - "04-13", - "04-15", - "04-17", - "04-19", - "04-21", - "04-23", - "04-25", - "04-27", - "04-28", - "04-31", - "04-34", - "04-37", - "04-39", - "04-41", - "04-43", - "04-46", - "04-48", - "04-51", - "04-53", - "05-title", - "05-01", - "05-05", - "05-07", - "05-09", - "05-10", - "05-12", - "05-14", - "05-16", - "05-19", - "05-21", - "05-24", - "05-25", - "05-26", - "05-28", - "05-30", - "05-33", - "05-36", - "05-39", - "05-41", - "05-43", - "05-45", - "15-title", - "15-01", - "15-03", - "15-05", - "15-08", - "15-10", - "15-12", - "15-14", - "15-16", - "15-18", - "15-20", - "15-23", - "15-26", - "16-title", - "18-title", - "18-01", - "18-04", - "18-06", - "18-08", - "18-10", - "18-12", - "18-15", - "18-17", - "18-19", - "18-22", - "18-25", - "18-28", - "18-31", - "18-33", - "18-36" + "21-24" ] } \ No newline at end of file