fix conflicts

[roojs1] / docs / symbols / Roo.bootstrap.form.ComboBox.json

diff --git a/docs/symbols/Roo.bootstrap.form.ComboBox.json b/docs/symbols/Roo.bootstrap.form.ComboBox.json
index 220dd92..c1001f5 100644 (file)
--- a/docs/symbols/Roo.bootstrap.form.ComboBox.json
+++ b/docs/symbols/Roo.bootstrap.form.ComboBox.json
@@ -1500,6 +1500,25 @@
       "params" : [],
       "returns" : []
     },
+    {
+      "name" : "getAutoCreateLabel",
+      "type" : "function",
+      "desc" : "autocreate the label - also used by textara... ?? and others?",
+      "sig" : "()\n{\n\n}",
+      "static" : false,
+      "memberOf" : "Roo.bootstrap.form.Input",
+      "isStatic" : false,
+      "isConstructor" : false,
+      "isPrivate" : false,
+      "example" : "",
+      "deprecated" : "",
+      "since" : "",
+      "see" : "",
+      "exceptions" : "",
+      "requires" : "",
+      "params" : [],
+      "returns" : []
+    },
     {
       "name" : "validate",
       "type" : "function",