fix conflicts

[roojs1] / docs / src / Roo_form_HtmlEditor.js.html

diff --git a/docs/src/Roo_form_HtmlEditor.js.html b/docs/src/Roo_form_HtmlEditor.js.html
index 98dc47c..705675e 100644 (file)
--- a/docs/src/Roo_form_HtmlEditor.js.html
+++ b/docs/src/Roo_form_HtmlEditor.js.html
@@ -222,6 +222,7 @@
             * @param {Roo.HtmlEditorCore} this
             */
             </span><span class="jsdoc-var">paste</span><span class="jsdoc-syntax">: </span><span class="jsdoc-keyword">true
+
         </span><span class="jsdoc-syntax">});
         </span><span class="jsdoc-var">this.defaultAutoCreate </span><span class="jsdoc-syntax">=  {
             </span><span class="jsdoc-var">tag</span><span class="jsdoc-syntax">: </span><span class="jsdoc-string">&quot;textarea&quot;</span><span class="jsdoc-syntax">,