fix merge hook error
fix merge hook error

75team/thinkjs,75team/thinkjs,thinkjs/thinkjs,Qihoo360/thinkjs,akira-cn/thinkjs,maxzhang/thinkjs,akira-cn/thinkjs,maxzhang/thinkjs,snadn/thinkjs,maxzhang/thinkjs,akira-cn/thinkjs,75team/thinkjs