From 2da590bb7b5a9da98fc5d30227a4bc3ca7a2ad0a Mon Sep 17 00:00:00 2001 From: Talo Date: Sun, 24 Dec 2023 17:35:32 +1100 Subject: [PATCH] Sun Dec 24 2023 17:35:32 GMT+1100 (Solomon Islands Time) --- 02/06.txt | 6 +----- front/title.txt | 6 +----- manifest.json | 26 ++++++++++++++------------ 3 files changed, 16 insertions(+), 22 deletions(-) diff --git a/02/06.txt b/02/06.txt index f262fb3..f73c529 100644 --- a/02/06.txt +++ b/02/06.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 6 A wosua na yam ka yam mi yapu,ka yap gene sewe tusua a na too niokate,God too esi sa gini an,ka yap dimiane ka yap i veanten tusua,toi sie tusua ne nie. \v 7 Yen sa tetes ane an,yam esi na nam lingkukuone ndaa ne wuan miane nio na yato du yen bakvi wagimiane peter mi lingkukuone nda ne wuan miane nio na yan du yen bakvi. \v 8 God mi gies yen peter yen san apostieship miane nio na yam bakvi,mi gies yen nie mon vian miane Gentiles -======= -\v 6 A wosua na yam ka yam mi yapu,ka yap gene sewe tusua a na too niokate,God too esi sa gini an,ka yap dimiane ka yap i veanten tusua,toi sie tusua ne nie.\v 7 Yen sa tetes an,yam esi na nam lingkukuone ndaa ne wuan miane nio na yato du yen bakvi wagimiane peter mi lingkukuone nda ne wuan miane nio na yan du yen bakvi.\v 8 God mi gies yen peter yen san apostieship miane nio na yam bakvi,mi gies yen nie mon vian miane Gentiles ->>>>>>> b7b9fd61efdc6088d817cb5345a7f9a7f26fac73 +\v 6 A wosua na yam ka yam mi yapu,ka yap gene sewe tusua a na too niokate,God too esi sa gini an,ka yap dimiane ka yap i veanten tusua,toi sie tusua ne nie. \v 7 Yen sa tetes an,yam esi na nam lingkukuone ndaa ne wuan miane nio na yato du yen bakvi wagimiane peter mi lingkukuone nda ne wuan miane nio na yan du yen bakvi. \v 8 God mi gies yen peter yen san apostieship miane nio na yam bakvi,mi gies yen nie mon vian miane Gentiles \ No newline at end of file diff --git a/front/title.txt b/front/title.txt index 4375423..0efe517 100644 --- a/front/title.txt +++ b/front/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -Kelesean -======= -Galatians ->>>>>>> b7b9fd61efdc6088d817cb5345a7f9a7f26fac73 +Kelesean \ No newline at end of file diff --git a/manifest.json b/manifest.json index 2c75c91..98fe889 100644 --- a/manifest.json +++ b/manifest.json @@ -39,11 +39,24 @@ "Joseph Bong" ], "finished_chunks": [ + "front-title", "01-title", "01-01", "01-03", "01-06", + "01-08", "01-11", + "01-13", + "01-15", + "01-18", + "01-21", + "02-title", + "02-01", + "02-03", + "02-06", + "02-11", + "02-13", + "02-15", "02-17", "02-20", "03-title", @@ -81,17 +94,6 @@ "06-09", "06-11", "06-14", - "06-17", - "02-11", - "02-03", - "02-01", - "02-13", - "02-15", - "02-title", - "01-08", - "01-13", - "01-15", - "01-18", - "01-21" + "06-17" ] } \ No newline at end of file