Revert "修正未删除的冲突标记"

This reverts commit 0141f09ae4a8b9d696d8434629ecc5f19d7af4bb.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Rtt.js