From 5d726c33c3da931a7c5c43bba3f37a4e8c11ca93 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 18 九月 2023 21:11:21 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

---
 CanadaMes-ui/src/lang/locales/en-US.json |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/CanadaMes-ui/src/lang/locales/en-US.json b/CanadaMes-ui/src/lang/locales/en-US.json
index 0e67c30..09b53ef 100644
--- a/CanadaMes-ui/src/lang/locales/en-US.json
+++ b/CanadaMes-ui/src/lang/locales/en-US.json
@@ -274,9 +274,16 @@
   "Are you sure to perform this operation ?":"Are you sure to perform this operation ?",
   "prompt":"prompt",
   "Yes":"Yes",
+<<<<<<< .mine
+  "No":"No",
+  "ElectricalPassword":"ElectricalPassword"
+
+
+=======
   "No":"No",
   "Please enter the password":"Please enter the password",
   "Password error":"Password error",
   "DataBase Connection failed":"DataBase Connection failed"
+>>>>>>> .theirs
 
 }
\ No newline at end of file

--
Gitblit v1.8.0