From 6b4f6ee959bed4dc87bc99caac4f4e5b26e04e33 Mon Sep 17 00:00:00 2001
From: garnetthan <you@example.com>
Date: Fri, 29 Nov 2019 09:44:29 +0800
Subject: [PATCH] =?UTF-8?q?Fri=20Nov=2029=202019=2009:44:26=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

---
 04/18.txt | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/04/18.txt b/04/18.txt
index 24b4995..90499c1 100644
--- a/04/18.txt
+++ b/04/18.txt
@@ -1,18 +1,10 @@
 [
 	{
 		"title": "法勒斯的后代",
-<<<<<<< HEAD
 		"body": "“延续的后代”。因为前面提到法勒斯是犹大的儿子，作者在此继续列出了从法勒斯开始的家谱。"
 	},
 	{
 		"title": "希斯仑······兰",
 		"body": "（参：translate_names）"
-=======
-		"body": "“延续下来的后代。”因为在之前就有提到说法勒斯是犹大的儿子，本书的作者因次就继续列出法勒斯延续下来的后代。"
-	},
-	{
-		"title": "希斯崙…蘭",
-		"body": "希斯崙…蘭"
->>>>>>> 58d1109f7013965ed969b6e6d9157c3a9fcea1ac
 	}
 ]
\ No newline at end of file