From e744708295a5a439a3658ff6e1cd61f441b093f8 Mon Sep 17 00:00:00 2001 From: Talo Date: Fri, 6 Oct 2023 09:33:34 +1100 Subject: [PATCH] Fri Oct 06 2023 09:33:34 GMT+1100 (Solomon Islands Time) --- 09/32.txt | 6 +----- 09/35.txt | 6 +----- manifest.json | 5 +++++ 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/09/32.txt b/09/32.txt index 551a632..b6fcaf8 100644 --- a/09/32.txt +++ b/09/32.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 32 Mo taem tufala man ya oli stap go, ol man oli tekem wan man i kam long Jisas. Man ya i no save toktok from we i got devel i stap long hem. \v 33 Taem Jisas i ronemaot ol devel ya finis, man ya i toktok, Nao ol man we oli stap luk samting ya oli talem se, "Samting ya i neva hapen long Israel." \v 34 Be ol farasi oli stap telem se, "Hemia jif blong ol devel ya, we i stap givim pawa long ol man ya blong i ronemaot devel long ol man." -======= -\v 32 Mo taem tufala man ya oli stap go, ol man oli tekem wan man i kam long Jisas. Man ya i no save toktok from we i got devel i stap long hem. \v 33 Taem Jisas i ronemaot ol devel ya finis, man ya i toktok, Nao ol man we oli stap luk samting ya oli talem se, "Samting ya i neva hapen long Israel." \v 34 Be ol farasi oli stap telem se, "Hemia jif blong ol devel ya, we i stap givim pawa long ol man ya blong i ronemaot devel long ol man." ->>>>>>> 489ff1542ddebce32da6079e4b54f072a793f94c +\v 32 Mo taem tufala man ya oli stap go, ol man oli tekem wan man i kam long Jisas. Man ya i no save toktok from we i got devel i stap long hem. \v 33 Taem Jisas i ronemaot ol devel ya finis, man ya i toktok, Nao ol man we oli stap luk samting ya oli talem se, "Samting ya i neva hapen long Israel." \v 34 Be ol farasi oli stap telem se, "Hemia jif blong ol devel ya, we i stap givim pawa long ol man ya blong i ronemaot devel long ol man." \ No newline at end of file diff --git a/09/35.txt b/09/35.txt index 9d33dca..f666557 100644 --- a/09/35.txt +++ b/09/35.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 35 ." Jisas i girap mo i go long evri city mool vilij. Hem i continu blong tij long ol haos blong prea, i stap prijin gud nius blong kingdom blong God mo stap hilin ol man long ol evri kaen sick. \v 36 Taem hem i luk fulup man, hem i sore tumors long olgeta, from i luk save se oli stap harem nogud mo tingting blong olgeta i stap feltaon. Oli olsem ol sipsip we i nogut man blong lukad long olgeta. -======= -\v 35 Jisas i girap mo i go long evri city mool vilij. Hem i continu blong tij long ol haos blong prea, i stap prijin gud nius blong kingdom blong God mo stap hilin ol man long ol evri kaen sick. \v 36 Taem hem i luk fulup man, hem i sore tumors long olgeta, from i luk save se oli stap harem nogud mo tingting blong olgeta i stap feltaon. Oli olsem ol sipsip we i nogut man blong lukad long olgeta. ->>>>>>> 489ff1542ddebce32da6079e4b54f072a793f94c +\v 35 Jisas i girap mo i go long evri city mool vilij. Hem i continu blong tij long ol haos blong prea, i stap prijin gud nius blong kingdom blong God mo stap hilin ol man long ol evri kaen sick. \v 36 Taem hem i luk fulup man, hem i sore tumors long olgeta, from i luk save se oli stap harem nogud mo tingting blong olgeta i stap feltaon. Oli olsem ol sipsip we i nogut man blong lukad long olgeta. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 903007a..2414392 100644 --- a/manifest.json +++ b/manifest.json @@ -160,11 +160,14 @@ "09-14", "09-16", "09-17", + "09-18", "09-20", "09-23", "09-25", "09-27", "09-29", + "09-32", + "09-35", "09-37", "10-title", "10-01", @@ -289,8 +292,10 @@ "16-27", "17-title", "17-01", + "17-03", "17-05", "17-09", + "17-11", "17-14", "17-17", "17-19",