fix conflicts

[roojs1] / Roo / form / HtmlEditor.js

diff --git a/Roo/form/HtmlEditor.js b/Roo/form/HtmlEditor.js
index a6baf6f..5f1a891 100644 (file)
--- a/Roo/form/HtmlEditor.js
+++ b/Roo/form/HtmlEditor.js
@@ -222,6 +222,7 @@ Roo.extend(Roo.form.HtmlEditor, Roo.form.Field, {
             * @param {Roo.HtmlEditorCore} this
             */
             paste: true 
+            
         });
         this.defaultAutoCreate =  {
             tag: "textarea",