From 4a700bbe9efa733a7cf9f9609a409c39101ebff2 Mon Sep 17 00:00:00 2001
From: cehua_lgq <cehua_lgq@163.com>
Date: 星期四, 25 十月 2018 21:25:44 +0800
Subject: [PATCH] Merge branch '1.1.0' of http://192.168.0.87:10010/r/snxx_server into 1.1.0

---
 CoreServerGroup/GameServer/PySysDB/tagQuestionBank.txt |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CoreServerGroup/GameServer/PySysDB/tagQuestionBank.txt b/CoreServerGroup/GameServer/PySysDB/tagQuestionBank.txt
index c4e9f37..81e8ee0 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagQuestionBank.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagQuestionBank.txt
@@ -252,9 +252,9 @@
 251	['关羽']
 252	['杜甫']
 253	['妻子','老婆']
-255	['望庐山瀑布']
-256	['白居易']
-258	['贵州']
-259	['匡衡']
-260	['诸葛亮']
-261	['儒家','儒']
+254	['望庐山瀑布']
+255	['白居易']
+256	['贵州']
+257	['匡衡']
+258	['诸葛亮']
+259	['儒家','儒']

--
Gitblit v1.8.0