fix conflicts

[roojs1] / docs / symbols / Roo.bootstrap.Component.json

diff --git a/docs/symbols/Roo.bootstrap.Component.json b/docs/symbols/Roo.bootstrap.Component.json
index 0a2a72e..7658113 100644 (file)
--- a/docs/symbols/Roo.bootstrap.Component.json
+++ b/docs/symbols/Roo.bootstrap.Component.json
@@ -12,7 +12,7 @@
     "Roo.bootstrap.nav.Simplebar" : [
       "Roo.bootstrap.PagingToolbar",
       "Roo.bootstrap.PopoverNav",
-      "Roo.bootstrap.form.HtmlEditorToolbarStandard",
+      "Roo.bootstrap.form.HtmlEditorToolbar.Standard",
       "Roo.bootstrap.nav.Headerbar"
     ],
     "Roo.bootstrap.Button" : [
@@ -108,6 +108,7 @@
       "Roo.bootstrap.form.DateField",
       "Roo.bootstrap.form.MonthField",
       "Roo.bootstrap.form.NumberField",
+      "Roo.bootstrap.form.Password",
       "Roo.bootstrap.form.RadioSet",
       "Roo.bootstrap.form.SecurePass",
       "Roo.bootstrap.form.TextArea",
@@ -167,6 +168,7 @@
     "Roo.bootstrap.form.MoneyField",
     "Roo.bootstrap.form.MonthField",
     "Roo.bootstrap.form.NumberField",
+    "Roo.bootstrap.form.Password",
     "Roo.bootstrap.form.PhoneInput",
     "Roo.bootstrap.form.Radio",
     "Roo.bootstrap.form.RadioSet",