fix conflicts

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

diff --git a/docs/src/Roo_form_Field.js.html b/docs/src/Roo_form_Field.js.html
index 5826f20..4d79119 100644 (file)
--- a/docs/src/Roo_form_Field.js.html
+++ b/docs/src/Roo_form_Field.js.html
@@ -24,6 +24,9 @@
 </span><span class="jsdoc-var">Roo.extend</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">Roo.form.Field</span><span class="jsdoc-syntax">, </span><span class="jsdoc-var">Roo.BoxComponent</span><span class="jsdoc-syntax">,  {
     </span><span class="jsdoc-comment">/**
      * @cfg {String} fieldLabel Label to use when rendering a form.
+     */
+       /**
+     * @cfg {String} labelSeparator the ':' after a field label (default :)  = set it to empty string to hide the field label.
      */
        /**
      * @cfg {String} qtip Mouse over tip