fix conflicts

[roojs1] / buildSDK / dependancy_ui.txt

diff --git a/buildSDK/dependancy_ui.txt b/buildSDK/dependancy_ui.txt
index 8905c9c..71e0d3e 100644 (file)
--- a/buildSDK/dependancy_ui.txt
+++ b/buildSDK/dependancy_ui.txt
@@ -87,6 +87,7 @@ Roo.menu.ColorMenu
 Roo.form.TextItem
 Roo.form.Field
 Roo.form.TextField
+Roo.form.Password
 Roo.form.Hidden
 Roo.form.TriggerField
 Roo.form.TextArea
@@ -115,6 +116,7 @@ Roo.htmleditor.FilterBlack
 Roo.htmleditor.FilterComment
 Roo.htmleditor.FilterKeepChildren
 Roo.htmleditor.FilterParagraph
+Roo.htmleditor.FilterHashLink
 Roo.htmleditor.FilterSpan
 Roo.htmleditor.FilterTableWidth
 Roo.htmleditor.FilterWord