fix conflicts

[roojs1] / docs / symbols / Roo.bootstrap.nav.Bar.json

diff --git a/docs/symbols/Roo.bootstrap.nav.Bar.json b/docs/symbols/Roo.bootstrap.nav.Bar.json
index 36dbeae..db09c05 100644 (file)
--- a/docs/symbols/Roo.bootstrap.nav.Bar.json
+++ b/docs/symbols/Roo.bootstrap.nav.Bar.json
@@ -13,7 +13,7 @@
     "Roo.bootstrap.nav.Simplebar" : [
       "Roo.bootstrap.PagingToolbar",
       "Roo.bootstrap.PopoverNav",
-      "Roo.bootstrap.form.HtmlEditorToolbarStandard",
+      "Roo.bootstrap.form.HtmlEditorToolbar.Standard",
       "Roo.bootstrap.nav.Headerbar"
     ]
   },