Fri Nov 29 2019 09:44:26 GMT+0800 (中国标准时间)

2019-11-29 09:44:29 +08:00 · 2019-11-29 09:44:29 +08:00 · 6b4f6ee959
parent 46ee1b6d7c
commit 6b4f6ee959
1 changed files with 0 additions and 8 deletions
--- a/04/18.txt
+++ b/04/18.txt
@ -1,18 +1,10 @@
 [
 	{
 		"title": "法勒斯的后代",
-<<<<<<< HEAD
 		"body": "“延续的后代”。因为前面提到法勒斯是犹大的儿子，作者在此继续列出了从法勒斯开始的家谱。"
 	},
 	{
 		"title": "希斯仑······兰",
 		"body": "（参：translate_names）"
-=======
-		"body": "“延续下来的后代。”因为在之前就有提到说法勒斯是犹大的儿子，本书的作者因次就继续列出法勒斯延续下来的后代。"
-	},
-	{
-		"title": "希斯崙…蘭",
-		"body": "希斯崙…蘭"
->>>>>>> 58d1109f7013965ed969b6e6d9157c3a9fcea1ac
 	}
 ]