From 25689c5362d091e185f98d160815170fed2ab577 Mon Sep 17 00:00:00 2001
From: garnetthan <you@example.com>
Date: Fri, 29 Nov 2019 10:11:39 +0800
Subject: [PATCH] =?UTF-8?q?Fri=20Nov=2029=202019=2010:11:37=20GMT+0800=20(?=
 =?UTF-8?q?=E4=B8=AD=E5=9B=BD=E6=A0=87=E5=87=86=E6=97=B6=E9=97=B4)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 01/01.txt     | 21 ---------------------
 01/03.txt     | 29 -----------------------------
 01/06.txt     |  2 +-
 01/08.txt     |  2 +-
 manifest.json |  3 +++
 5 files changed, 5 insertions(+), 52 deletions(-)

diff --git a/01/01.txt b/01/01.txt
index f3ea09b..e9c93c1 100644
--- a/01/01.txt
+++ b/01/01.txt
@@ -1,6 +1,5 @@
 [
 	{
-<<<<<<< HEAD
 		"title": "It happened",
 		"body": "NA"
 	},
@@ -19,25 +18,5 @@
 	{
 		"title": "犹大伯利恒的以法他人",
 		"body": "他们是以法莲支派的人，住在犹大的伯利恒。"
-=======
-		"title": "这是发生在",
-		"body": "“这是发生在”是一种常見的描述历史事件的开头。"
-	},
-	{
-		"title": "在士师执政的时候",
-		"body": "在士师领导和治理以色列的时期。"
-	},
-	{
-		"title": "在国中",
-		"body": "在国中是意指在以色列国中。"
-	},
-	{
-		"title": "有一个人",
-		"body": "“有一个人”是一种常见的故事介绍人物的起头。"
-	},
-	{
-		"title": "犹大伯利恒的以法他人",
-		"body": "这些人原来是摩押支派，后来则寄居在犹大的伯利恒。"
->>>>>>> 58d1109f7013965ed969b6e6d9157c3a9fcea1ac
 	}
 ]
\ No newline at end of file
diff --git a/01/03.txt b/01/03.txt
index be923de..04dc823 100644
--- a/01/03.txt
+++ b/01/03.txt
@@ -1,6 +1,5 @@
 [
 	{
-<<<<<<< HEAD
 		"title": "剩下妇人和她两个儿子",
 		"body": "“拿俄米只有两个儿子和她在一起”（UDB）"
 	},
@@ -27,33 +26,5 @@
 	{
 		"title": "剩下拿俄米",
 		"body": "拿俄米成了寡妇。"
-=======
-		"title": "剩下她和两个儿子",
-		"body": "拿俄米和两个她的两个儿子一起。"
-	},
-	{
-		"title": "娶妻子",
-		"body": "英文的”took wives”就是指娶某某人为妻的惯用语。并不是说他们找了已经结婚的女子做妻子。"
-	},
-	{
-		"title": "从摩押来的女子们",
-		"body": "拿俄米的两个儿子娶了摩押的女子为妻。摩押人原是敬拜别神的。"
-	},
-	{
-		"title": "其中一个的名字是",
-		"body": "其中一个妻子的名字是。"
-	},
-	{
-		"title": "另外一个的名字是",
-		"body": "另外一个妻子的名字是。"
-	},
-	{
-		"title": "十年",
-		"body": "当俄珥巴和摩押在摩押地十年之后，玛伦和基连就死了。"
-	},
-	{
-		"title": "拿俄米因此",
-		"body": "因为拿俄米的儿子们也死了(她的丈夫更早以前也死了)，她就成了寡妇。"
->>>>>>> 58d1109f7013965ed969b6e6d9157c3a9fcea1ac
 	}
 ]
\ No newline at end of file
diff --git a/01/06.txt b/01/06.txt
index 44eeaac..b3f95c4 100644
--- a/01/06.txt
+++ b/01/06.txt
@@ -13,7 +13,7 @@
 	},
 	{
 		"title": "儿妇",
-		"body": "儿媳 嫁给拿俄米的儿子的女人"
+		"body": "儿媳**-嫁给拿俄米的儿子的女人"
 	},
 	{
 		"title": "they walked down the road",
diff --git a/01/08.txt b/01/08.txt
index 3099a6b..a9c0e7d 100644
--- a/01/08.txt
+++ b/01/08.txt
@@ -1,7 +1,7 @@
 [
 	{
 		"title": "儿妇",
-		"body": "儿媳——“儿子的妻子”或“儿子的遗孀”"
+		"body": "儿媳**-“儿子的妻子”或“儿子的遗孀”"
 	},
 	{
 		"title": "你们各人",
diff --git a/manifest.json b/manifest.json
index 4e004ef..e3a9226 100644
--- a/manifest.json
+++ b/manifest.json
@@ -41,6 +41,9 @@
 	"finished_chunks": [
 		"front-title",
 		"01-title",
+		"01-01",
+		"01-03",
+		"01-06",
 		"01-08",
 		"01-11",
 		"01-14",