add ignore file
ignore
Conf
update function
edit ignore
git rm -r --cached
set ignore
set ignore
set ignore
Merge branch 'feature/1' into published

Conflicts:
	.gitignore
	Conf.txt
	功能1.txt
	测试文件.txt