ignore file conf.json

Signed-off-by: sxfs <haohtml@gmail.com>
Merge branch 'master' of github.com:cfanbo/test1

Conflicts:
	main/conf.json