Fixed merge left-over
Fixed merge left-over

programming086/DTRichTextEditor,liulinjian/DTRichTextEditor,Cocoanetics/DTRichTextEditor,fishermenlabs/DTRichTextEditor,programming086/DTRichTextEditor,fishermenlabs/DTRichTextEditor,liulinjian/DTRichTextEditor