Thu Nov 14 2024 12:15:53 GMT+1000 (Papua New Guinea Time)

01/01.txt

@@ -1 +1,5 @@
-\c 1 \v 1 Planti manmeri luksave long wok bilong mipela, \v 2 olsem tasol ol lain pastaim i soim mipela, \v 3 em luk gutpela olsem tasol, ol soim mipela, \v 4 olsem tasol bai yu save gut olsem samtin yu lainim,
+<<<<<<< HEAD
+\c 1 \v 1 Planti wokim wok blong long luk save wok yumi mekim, \v 2 olsem tasol ol suvim mipela, mipela ai witnes na wokman blong tok blong God. \v 3 em luk gutpela long mi long sekim olgeta samtin pastaim na stret wantaim Theopil, \v 4 na bai yu save long stretpela samtin ol lainim yu,
+=======
+\c 1 \v 1 Planti manmeri luksave long wok bilong mipela, \v 2 olsem tasol ol lain pastaim i soim mipela, \v 3 em luk gutpela olsem tasol, ol soim mipela, \v 4 olsem tasol bai yu save gut olsem samtin yu lainim,
+>>>>>>> 7ef4a1d2d43ca93e8e48a2ed7f6cc4f0fd995128

01/title.txt

@@ -0,0 +1 @@
+Sapta 1

front/title.txt

@@ -0,0 +1 @@
+Luk 1

manifest.json

@@ -33,10 +33,12 @@
 	],
 	"parent_draft": {},
 	"translators": [
+		"Aiyugam1379",
 		"David Gudiri"
 	],
 	"finished_chunks": [
-		"01-01",
+		"front-title",
+		"01-title",
 		"01-05"
 	]
 }