aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values-zh-rTW/strings.xml
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/main/res/values-zh-rTW/strings.xml3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index 4d831111..9a59cfe6 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -76,12 +76,9 @@
<string name="pref_xmpp_resource">XMPP 資源</string>
<string name="pref_xmpp_resource_summary">客戶端標示名稱</string>
<string name="pref_accept_files">接收文件</string>
-<<<<<<< HEAD
<string name="pref_accept_files_size_summary">自動接收小於 … 的文件</string>
<string name="pref_notification_settings">通知設定</string>
-=======
<string name="pref_accept_files_summary">自動接收小於 … 的文件</string>
->>>>>>> 1.10.0
<string name="pref_notifications">通知</string>
<string name="pref_notifications_summary">收到新訊息時通知</string>
<string name="pref_vibrate">震動</string>