From 46fcdc4765096152014b2ab157c02e003d59a5d6 Mon Sep 17 00:00:00 2001 From: Talo Date: Tue, 5 Sep 2023 14:17:49 +1100 Subject: [PATCH] Tue Sep 05 2023 14:17:49 GMT+1100 (Solomon Islands Time) --- 01/01.txt | 10 +--------- manifest.json | 17 +++++++++-------- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/01/01.txt b/01/01.txt index 9049c28..ca19181 100644 --- a/01/01.txt +++ b/01/01.txt @@ -1,9 +1 @@ -<<<<<<< HEAD -\c 1 \v 1 Mi Pol,mi kam wan aposol blong Jisas Kraes folem wil blong God,mo brata blong yumi sostenes, - -\v 2 mi stap raetem leta ya igo long yufala long corin mo yufala we i biliv long God,long olgeta we God i jusumaot olgeta we oli blong hem from oli ol man blong Jisas Kraes we God i singaot ol holi man,mo evriwan long evri ples we i singaot long nem blong Masta Jisas Kraes,we hemi Masta blong olgeta mo hemi Masta blong yumi. - -\v 3 Prea blong mi se God papa blong yumi wetem Masta Jisas kraes bae givhan long yufala mo pis blong tufala istap wetem yufala. -======= -\v 1 \v 2 \v 3 iiieq111nbm,..09q ->>>>>>> a90aea86affe93ebf155e2a196d8d64ef3b4597f +\c 1 \v 1 Mi Pol, mi kam wan aposol blong Jisas Kraes folem wil blong God, mo brata blong yumi sostenes, \v 2 mi stap raetem leta ya igo long yufala long corin mo yufala we i biliv long God,long olgeta we God i jusumaot olgeta we oli blong hem from oli ol man blong Jisas Kraes we God i singaot ol holi man,mo evriwan long evri ples we i singaot long nem blong Masta Jisas Kraes,we hemi Masta blong olgeta mo hemi Masta blong yumi. \v 3 Prea blong mi se God papa blong yumi wetem Masta Jisas kraes bae givhan long yufala mo pis blong tufala istap wetem yufala. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 8b79bcd..b22ae57 100644 --- a/manifest.json +++ b/manifest.json @@ -40,6 +40,7 @@ "finished_chunks": [ "front-title", "01-title", + "01-01", "01-04", "01-07", "01-10", @@ -73,19 +74,19 @@ "10-28", "10-31", "11-title", + "11-01", + "11-05", "11-07", "11-09", + "11-11", + "11-13", + "11-17", + "11-20", "11-23", + "11-25", "11-27", "11-31", "11-33", - "15-title", - "11-05", - "11-11", - "11-17", - "11-20", - "11-25", - "11-01", - "11-13" + "15-title" ] } \ No newline at end of file