From c0db0e759741f693ddb7e7f2835fc61a9a7099aa Mon Sep 17 00:00:00 2001
From: Emma Marichal <64773544+emmamarichal@users.noreply.github.com>
Date: Tue, 25 Jun 2024 10:03:05 +0200
Subject: [PATCH] Update wuu_Hant.textproto

---
 lang/Lib/gflanguages/data/languages/wuu_Hant.textproto | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lang/Lib/gflanguages/data/languages/wuu_Hant.textproto b/lang/Lib/gflanguages/data/languages/wuu_Hant.textproto
index 8b60d5e6bd..ba0cd4b28d 100644
--- 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 {
-- 
2.47.2