sql
句
Merge remote-tracking branch 'choose_remote_name/master'
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	config/service-context.xml
f