Update hsn_Hant.textproto

diff --git a/lang/Lib/gflanguages/data/languages/hsn_Hant.textproto b/lang/Lib/gflanguages/data/languages/hsn_Hant.textproto
index 5c4648e3fb801cf9ed069336223d527497da319e..aa1c89134805794700384d050ddf421943748f4e 100644 (file)
--- a/lang/Lib/gflanguages/data/languages/hsn_Hant.textproto
+++ b/lang/Lib/gflanguages/data/languages/hsn_Hant.textproto
@@ -2,11 +2,7 @@ id: "hsn_Hant"
 language: "hsn"
 script: "Hant"
 name: "Xiang Chinese"
-<<<<<<< HEAD
-autonym: "Xiang Chinese（Traditional）"
-=======
 autonym: "湘語"
->>>>>>> f6a234f61ded3f2c386870192ad701f47105c23b
 population: 40426580
 region: "CN"
 sample_text {