四灵试炼修改

protos/PlayerInfoProto.proto

@@ -75,7 +75,6 @@ import "CommonProto.proto";
 		optional int32 worldLeve = 34;//世界等级
 		repeated int32 DemonsTrialRewardInfo = 35;//心魔试炼已领取奖励信息
 		repeated HeadFrameList headFrameBag = 36;//头像框背包
-<<<<<<< HEAD
 		repeated UserSkinInfo userSkinList = 37;//玩家皮肤信息
 		repeated UserTitleInfo userTitleList = 38;//玩家称号信息
 		repeated UserMountInfo userMountList = 39;//玩家坐骑信息
@@ -84,9 +83,7 @@ import "CommonProto.proto";
 		repeated PurpleMansionSeal sealList = 42;//神印列表
 		optional int32 randomCount = 43;//抽卡剩余必出
 		repeated randomTypeNum drawTimes = 44;//类型抽卡总次数
-=======
-		repeated HelpFightList helpFightList = 37;//已选取的助战信息
->>>>>>> master_test_hw_four_challenge
+		repeated HelpFightList helpFightList = 45;//已选取的助战信息
 	}