忽略config文件
设置忽略
Merge branch 'master' of https://github.com/kazaff/angular-build-seed

Conflicts:
	app/config.js