fix conflicts

[roojs1] / docs / tree.json

diff --git a/docs/tree.json b/docs/tree.json
index 3e60aa0..cf31313 100644 (file)
--- a/docs/tree.json
+++ b/docs/tree.json
@@ -707,9 +707,15 @@
                 "is_class" : true
               },
               {
-                "name" : "Roo.bootstrap.form.HtmlEditorToolbarStandard",
-                "cn" : [],
-                "is_class" : true
+                "name" : "Roo.bootstrap.form.HtmlEditorToolbar",
+                "cn" : [
+                  {
+                    "name" : "Roo.bootstrap.form.HtmlEditorToolbar.Standard",
+                    "cn" : [],
+                    "is_class" : true
+                  }
+                ],
+                "is_class" : false
               },
               {
                 "name" : "Roo.bootstrap.form.Input",
@@ -731,11 +737,21 @@
                 "cn" : [],
                 "is_class" : true
               },
+              {
+                "name" : "Roo.bootstrap.form.MultiLineTag",
+                "cn" : [],
+                "is_class" : true
+              },
               {
                 "name" : "Roo.bootstrap.form.NumberField",
                 "cn" : [],
                 "is_class" : true
               },
+              {
+                "name" : "Roo.bootstrap.form.Password",
+                "cn" : [],
+                "is_class" : true
+              },
               {
                 "name" : "Roo.bootstrap.form.PhoneInput",
                 "cn" : [],
@@ -1361,6 +1377,11 @@
             "cn" : [],
             "is_class" : false
           },
+          {
+            "name" : "Roo.htmleditor.FilterHashLink",
+            "cn" : [],
+            "is_class" : false
+          },
           {
             "name" : "Roo.htmleditor.FilterKeepChildren",
             "cn" : [],