Update gan_Hant.textproto

diff --git a/lang/Lib/gflanguages/data/languages/gan_Hant.textproto b/lang/Lib/gflanguages/data/languages/gan_Hant.textproto
index 46d75e5bd63627debf68263196bbe959854f94f0..6a985c1866fb2d8aa3db3fa5555fa2c903122df7 100644 (file)
--- a/lang/Lib/gflanguages/data/languages/gan_Hant.textproto
+++ b/lang/Lib/gflanguages/data/languages/gan_Hant.textproto
@@ -2,13 +2,8 @@ id: "gan_Hant"
 language: "gan"
 script: "Hant"
 name: "Gan Chinese"
-<<<<<<< HEAD
-preferred_name: "Gan"
-autonym: "Gan Chinese（Traditional）"
-=======
 preferred_name: "Gan Chinese"
 autonym: "贛語"
->>>>>>> f6a234f61ded3f2c386870192ad701f47105c23b
 population: 23698340
 region: "CN"
 sample_text {