devConf
功能1
删除功能1
新增功能2
创建配置dev
添加功能3
Merge branch '新功能3' into published

Conflicts:
	Conf.txt