From 8c1e63d1bebc26be8a4b7b13d05bfdb00ff652cd Mon Sep 17 00:00:00 2001
From: cehua_LC <tingame100@163.com>
Date: 星期一, 08 十月 2018 09:53:09 +0800
Subject: [PATCH] Merge branch '1.0.18' of http://192.168.0.87:10010/r/snxx_server into 1.0.18

---
 ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/Encoding/EncodingTex.txt |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/Encoding/EncodingTex.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/Encoding/EncodingTex.txt
index 169bf98..e8828b6 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/Encoding/EncodingTex.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/Encoding/EncodingTex.txt
@@ -1,6 +1,6 @@
-#编码格式检查[是否对字符串进行base64编码, 字符串编码格式]
-#字符串编码格式，在base64为0时有效
-
-(
-[0, "utf8"]
+#编码格式检查[是否对字符串进行base64编码, 字符串编码格式]
+#字符串编码格式，在base64为0时有效
+
+(
+[0, "utf8"]
 )
\ No newline at end of file

--
Gitblit v1.8.0