diff --git a/LogicServer/data/config/PlatformQQ/BlueDiamondDaily.config b/LogicServer/data/config/PlatformQQ/BlueDiamondDaily.config
deleted file mode 100755
index 9ff516c..0000000
--- a/LogicServer/data/config/PlatformQQ/BlueDiamondDaily.config
+++ /dev/null
@@ -1,45 +0,0 @@
---P-平台福利QQ.xlsx 蓝钻每日礼包
-BlueDiamondDailyConfig={
-[1] = {
-	level = 1,
-	reward1 = {{type=0,id=269,count=1},{type=7,id=7,count=2},{type=0,id=247,count=3},},
-	reward2 = {{type=0,id=853,count=1},{type=7,id=7,count=2},{type=0,id=247,count=3},},
-	reward3 = {{type=0,id=421,count=3},{type=7,id=7,count=2},{type=0,id=247,count=3},},
-},
-[2] = {
-	level = 2,
-	reward1 = {{type=0,id=269,count=1},{type=7,id=7,count=2},{type=0,id=247,count=3},},
-	reward2 = {{type=0,id=853,count=1},{type=7,id=7,count=2},{type=0,id=247,count=3},},
-	reward3 = {{type=0,id=421,count=3},{type=7,id=7,count=2},{type=0,id=247,count=3},},
-},
-[3] = {
-	level = 3,
-	reward1 = {{type=0,id=269,count=1},{type=7,id=7,count=2},{type=0,id=247,count=3},},
-	reward2 = {{type=0,id=853,count=1},{type=7,id=7,count=2},{type=0,id=247,count=3},},
-	reward3 = {{type=0,id=421,count=3},{type=7,id=7,count=2},{type=0,id=247,count=3},},
-},
-[4] = {
-	level = 4,
-	reward1 = {{type=0,id=269,count=1},{type=7,id=7,count=2},{type=0,id=247,count=3},},
-	reward2 = {{type=0,id=853,count=1},{type=7,id=7,count=2},{type=0,id=247,count=3},},
-	reward3 = {{type=0,id=421,count=3},{type=7,id=7,count=2},{type=0,id=247,count=3},},
-},
-[5] = {
-	level = 5,
-	reward1 = {{type=0,id=261,count=1},{type=7,id=7,count=2},{type=0,id=247,count=3},},
-	reward2 = {{type=0,id=853,count=1},{type=7,id=7,count=2},{type=0,id=247,count=3},},
-	reward3 = {{type=0,id=421,count=3},{type=7,id=7,count=2},{type=0,id=247,count=3},},
-},
-[6] = {
-	level = 6,
-	reward1 = {{type=0,id=261,count=1},{type=7,id=7,count=2},{type=0,id=247,count=3},},
-	reward2 = {{type=0,id=853,count=1},{type=7,id=7,count=2},{type=0,id=247,count=3},},
-	reward3 = {{type=0,id=421,count=3},{type=7,id=7,count=2},{type=0,id=247,count=3},},
-},
-[7] = {
-	level = 7,
-	reward1 = {{type=0,id=261,count=1},{type=7,id=7,count=2},{type=0,id=247,count=3},},
-	reward2 = {{type=0,id=853,count=1},{type=7,id=7,count=2},{type=0,id=247,count=3},},
-	reward3 = {{type=0,id=421,count=3},{type=7,id=7,count=2},{type=0,id=247,count=3},},
-},
-}
\ No newline at end of file
diff --git a/LogicServer/data/config/PlatformQQ/LevelBlueDiamond.config b/LogicServer/data/config/PlatformQQ/LevelBlueDiamond.config
deleted file mode 100755
index 1dca334..0000000
--- a/LogicServer/data/config/PlatformQQ/LevelBlueDiamond.config
+++ /dev/null
@@ -1,18 +0,0 @@
---P-平台福利QQ.xlsx 蓝钻等级礼包
-LevelBlueDiamondConfig={
-[1] = {
-	id = 1,
-	level = 50,
-	reward = {{type=2,id=2,count=10000},{type=0,id=421,count=1}},
-},
-[2] = {
-	id = 2,
-	level = 60,
-	reward = {{type=2,id=2,count=15000},{type=0,id=421,count=1}},
-},
-[3] = {
-	id = 3,
-	level = 70,
-	reward = {{type=2,id=2,count=20000},{type=0,id=421,count=2}},
-},
-}
\ No newline at end of file
diff --git a/LogicServer/data/functions/GameConfigs.txt b/LogicServer/data/functions/GameConfigs.txt
index f720db2..391ea83 100755
--- a/LogicServer/data/functions/GameConfigs.txt
+++ b/LogicServer/data/functions/GameConfigs.txt
@@ -72,15 +72,6 @@
 --#include "data/config/YYPlatform/YYMemberConfig.config" once
 --#include "data/config/YYPlatform/YYVIPConfig.config" once
 --#include "data/config/YYPlatform/GameVIPConfig.config" once
-<<<<<<< HEAD
---#include "data/config/PlatformQQ/PlatformQQ.config" once  --qq
---#include "data/config/PlatformQQ/LoginQQ.config" once  --qq
---#include "data/config/PlatformQQ/BlueDiamondDaily.config" once  --qq
---#include "data/config/PlatformQQ/LevelBlueDiamond.config" once  --qq
-
-
-=======
->>>>>>> 44b47592110f16529c84a75e24c63ade008fbd02
 
 -- 套装
 --#include "data/config/SuitConfig.config" once