update to master

2019-09-09 08:34:28 +08:00 · 2019-09-09 08:34:28 +08:00 · 35ef7989bb
commit 35ef7989bb
parent 252748d30c
1 changed files with 0 additions and 7 deletions
--- 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)":{