CanadaMes-ui/src/lang/locales/en-US.json
@@ -274,7 +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 }
