Fix webpack config conflict
Fix webpack config conflict

t-zuehlsdorff/gitlabhq,jirutka/gitlabhq,htve/GitlabForChinese,axilleas/gitlabhq,t-zuehlsdorff/gitlabhq,mmkassem/gitlabhq,dreampet/gitlab,iiet/iiet-git,jirutka/gitlabhq,dplarson/gitlabhq,iiet/iiet-git,iiet/iiet-git,t-zuehlsdorff/gitlabhq,dplarson/gitlabhq,dplarson/gitlabhq,mmkassem/gitlabhq,mmkassem/gitlabhq,dreampet/gitlab,dreampet/gitlab,dplarson/gitlabhq,t-zuehlsdorff/gitlabhq,axilleas/gitlabhq,stoplightio/gitlabhq,htve/GitlabForChinese,mmkassem/gitlabhq,dreampet/gitlab,axilleas/gitlabhq,stoplightio/gitlabhq,jirutka/gitlabhq,jirutka/gitlabhq,htve/GitlabForChinese,htve/GitlabForChinese,stoplightio/gitlabhq,stoplightio/gitlabhq,iiet/iiet-git,axilleas/gitlabhq