From d5d541f6bc23fd70875bbc706639b7e48d50468a Mon Sep 17 00:00:00 2001
From: Guo_shaoshan <2055829622@qq.com>
Date: 星期二, 04 四月 2023 20:36:41 +0800
Subject: [PATCH] 更改解决冲突
---
app/src/main/res/values/strings.xml | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d9cfec7..114485d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,7 +3,10 @@
<string name="title_home">棣栭〉</string>
<string name="title_function">鍔熻兘</string>
+ <string name="title_family_memorabilia">瀹跺ぇ浜嬭</string>
<string name="title_personal_center">涓汉涓績</string>
+ <string name="title_family_create_project">寮犳皬app绔嬮」</string>
+ <string name="iv_fold_1_description">杩欐槸涓�涓睍寮�鎺т欢</string>
<!-- TODO: Remove or change this placeholder text -->
<string name="hello_blank_fragment">Hello blank fragment</string>
</resources>
\ No newline at end of file
--
Gitblit v1.9.1