Thu Oct 31 2019 10:10:01 GMT+0800 (Malay Peninsula Standard Time)

01/03.txt

@@ -1,15 +1,6 @@
 [
 	{
-<<<<<<< HEAD
-		"title": "耶和华让摩西告诉人们从牛群中带什么样的动物来作燔祭？",
-		"body": "耶和华让摩西告诉人们从牛群中带一只没有残疾的公牛或公羊作为燔祭。"
-	},
-	{
-		"title": "耶和华要求献祭的人做什么事情以使他的燔祭能够被悦纳并且可以为他赎罪？",
-		"body": "耶和华告诉人们，他们要把手按在燔祭牲的头上，这样燔祭就可以被悦纳，替他赎罪。"
-=======
 		"title": "",
 		"body": ""
->>>>>>> f6eed49f7726d3602b7bb0aa0610fe739768dfa2
 	}
 ]

manifest.json

@@ -34,7 +34,8 @@
 	"parent_draft": {},
 	"translators": [
 		"KLoshi",
-		"Alice Leaney"
+		"Alice Leaney",
+		"byword3"
 	],
 	"finished_chunks": [
 		"front-title",