From d281cfded5c14796cc92cc7e8a8432d5c13417a7 Mon Sep 17 00:00:00 2001
From: F0rb1d <10278743+f0rb1d@users.noreply.github.com>
Date: Sun, 3 Feb 2019 00:34:35 +0800
Subject: [PATCH] Merge fix.

---
 resources/lang/zh/base.php   | 2 +-
 resources/lang/zh/server.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/lang/zh/base.php b/resources/lang/zh/base.php
index f0777e78e..5613750bb 100644
--- a/resources/lang/zh/base.php
+++ b/resources/lang/zh/base.php
@@ -69,7 +69,7 @@ return [
         'last_name' => '名称',
         'update_identity' => '更新个人信息',
         'username_help' => '您的用户名必须未被他人使用，且仅包含下列字符：:requirements。',
-		'language' => '语言',
+        'language' => '语言',
     ],
     'security' => [
         'session_mgmt_disabled' => '您的托管商未启用此界面来管理账户会话。',
diff --git a/resources/lang/zh/server.php b/resources/lang/zh/server.php
index 565e63ced..56d76a97c 100644
--- a/resources/lang/zh/server.php
+++ b/resources/lang/zh/server.php
@@ -258,10 +258,10 @@ return [
             ],
         ],
     ],
-	    'allocations' => [
+    'allocations' => [
         'mass_actions' => '批量操作',
         'delete' => '删除分配地址',
-	],
+    ],
     'files' => [
         'exceptions' => [
             'invalid_mime' => '此类型文件无法通过面板内置编辑器编辑。',