From 99240be56f0fe4b0cda451b33681bce339220b82 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期六, 11 五月 2024 14:46:09 +0800
Subject: [PATCH] Merge branch 'test' into develop_new
---
app/src/main/res/values-en/strings.xml | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 7c5fec8..658fb17 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -245,5 +245,6 @@
<string name="deleting_please_wait">Deleting, please wait鈥�</string>
<string name="already_the_first_one">It\'s already the first one</string>
<string name="restarting_please_wait">Restarting, please wait</string>
+ <string name="port_conflict">Application conflicts. You need to close onpro or other versions of debugging application and then restart the this to try</string>
</resources>
\ No newline at end of file
--
Gitblit v1.8.0