Update cjy_Hant.textproto

diff --git a/lang/Lib/gflanguages/data/languages/cjy_Hant.textproto b/lang/Lib/gflanguages/data/languages/cjy_Hant.textproto
index f8b8e79f244ebb1b616065b045d2c2ec090ca614..f0f9cbaa02065ce8809b6db045db7d14d4667232 100644 (file)
--- a/lang/Lib/gflanguages/data/languages/cjy_Hant.textproto
+++ b/lang/Lib/gflanguages/data/languages/cjy_Hant.textproto
@@ -1,13 +1,8 @@
 id: "cjy_Hant"
 language: "cjy"
 script: "Hant"
-<<<<<<< HEAD
-name: "Chinese, Jinyu"
-autonym: "Jinyu Chinese（Traditional）"
-=======
 name: "Jin Chinese"
 autonym: "晉語"
->>>>>>> f6a234f61ded3f2c386870192ad701f47105c23b
 region: "CN"
 sample_text {
   masthead_full: "人生而自"