删除日志
Merge remote-tracking branch 'origin/master'

Conflicts:
	data/log/2014-12-29.log