From: Emma Marichal <64773544+emmamarichal@users.noreply.github.com>
Date: Tue, 25 Jun 2024 07:59:48 +0000 (+0200)
Subject: Update cjy_Hant.textproto
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8be7a9861352a49fdea558945d814c013f2d7428;p=thirdparty%2Fgoogle%2Ffonts.git

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 f8b8e79f24..f0f9cbaa02 100644
--- 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: "人生而自"