remove

removeremoveremove
Signed-off-by: wangxinqiang <wangxinqiang1129@gmail.com>
Merge remote-tracking branch 'origin/xinqiang.wang'

Conflicts:
	user.txt
init
Delete jfksd
commit123
12

12