From 35ef7989bbc37522ff4b9adbe0bc6beb5219bc09 Mon Sep 17 00:00:00 2001
From: YueR <yuer@promote.cache-dns.local>
Date: Mon, 9 Sep 2019 08:34:28 +0800
Subject: [PATCH] update to master

---
 .../assets/jsons/Translations/Diplomacy,Trade,Nations.json | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json b/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json
index 6ddadd6902..9edc483d90 100644
--- a/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json
+++ b/android/assets/jsons/Translations/Diplomacy,Trade,Nations.json
@@ -184,13 +184,6 @@
 		Simplified_Chinese:"我们遇到了城邦--[name]！"		
 		Russian:"Мы обнаружили город-государство [name]!"
 	}
-<<<<<<< HEAD
-	
-	"We have encountered [civName]!":{
-		Simplified_Chinese:"我们遇到了文明--[civName]！"
-	}
-=======
->>>>>>> upstream/master
 
 	// Friendship declaration flavor texts
 	"Declare Friendship ([numberOfTurns] turns)":{