Revert "dev"

This reverts commit 21f805fe1460f9905b11ad3c67a8a45da4d8a004.
PubConf
创建配置Pub
Merge branch '新功能3' into published

Conflicts:
	Conf.txt
del
Merge branch 'feature/1' into published

Conflicts:
	Conf.txt
add ignore file
edit ignore
add 功能2
Merge branch 'feature/1' into published

Conflicts:
	.gitignore
	Conf.txt
	功能1.txt
	测试文件.txt
no message
Merge branch 'feature/2' into published

Conflicts:
	Conf.txt
	功能1.txt
published 3333333
1
Merge branch 'feature/1' into develop

Conflicts:
	Conf.txt