Update wuu_Hant.textproto

diff --git a/lang/Lib/gflanguages/data/languages/wuu_Hant.textproto b/lang/Lib/gflanguages/data/languages/wuu_Hant.textproto
index 8b60d5e6bdcf1e716714396b49fed6768b300685..ba0cd4b28dad0428b467eb671f2aae1e6a5187f6 100644 (file)
--- a/lang/Lib/gflanguages/data/languages/wuu_Hant.textproto
+++ b/lang/Lib/gflanguages/data/languages/wuu_Hant.textproto
@@ -2,12 +2,8 @@ id: "wuu_Hant"
 language: "wuu"
 script: "Hant"
 name: "Wu Chinese"
-<<<<<<< HEAD
-autonym: "Wu Chinese（Traditional）"
-=======
 preferred_name: "Shanghainese"
 autonym: "吳語"
->>>>>>> f6a234f61ded3f2c386870192ad701f47105c23b
 population: 83641200
 region: "CN"
 sample_text {