合并代码

star_lock/images/lan/lan_en.json

@@ -796,7 +796,6 @@
   "购买":"Buy",
   "实名认证为付费功能，请购买后再使用":"Real-name authentication is a paid function, please use it after purchase",
   "密码不一致哦":"The passwords are inconsistent",
-<<<<<<< HEAD
 
   "退出添加":"Quit adding",
   "管理员已满":"Admin full",
@@ -809,7 +808,7 @@
   "卡已存在": "Card already exists",
   "锁上面添加密码已满": "Lock above add password is full",
   "密码已存在": "Password already exists",
-  "请输入密码": "Please enter password"
+  "请输入密码": "Please enter password",
 
   "真实姓名":"Real name",
   "身份证号":"ID number",

star_lock/images/lan/lan_keys.json

@@ -823,7 +823,6 @@
   "当前剩余数量":"当前剩余数量",
   "购买":"购买",
   "实名认证为付费功能，请购买后再使用":"实名认证为付费功能，请购买后再使用",
-<<<<<<< HEAD
 
   "退出添加":"退出添加",
   "管理员已满":"管理员已满",
@@ -836,7 +835,7 @@
   "卡已存在": "卡已存在",
   "锁上面添加密码已满": "锁上面添加密码已满",
   "密码已存在": "密码已存在",
-  "请输入密码": "请输入密码"
+  "请输入密码": "请输入密码",
 
   "真实姓名":"真实姓名",
   "身份证号":"身份证号",

star_lock/images/lan/lan_zh.json

@@ -826,7 +826,6 @@
   "当前剩余数量":"当前剩余数量",
   "购买":"购买",
   "实名认证为付费功能，请购买后再使用":"实名认证为付费功能，请购买后再使用",
-<<<<<<< HEAD
 
   "退出添加":"退出添加",
   "管理员已满":"管理员已满",
@@ -839,7 +838,7 @@
   "卡已存在": "卡已存在",
   "锁上面添加密码已满": "锁上面添加密码已满",
   "密码已存在": "密码已存在",
-  "请输入密码": "请输入密码"
+  "请输入密码": "请输入密码",
 
   "真实姓名":"真实姓名",
   "身份证号":"身份证号",