fix conflicts

[roojs1] / docs / src / Roo_dialog_namespace.js.html
diff --git a/docs/src/Roo_dialog_namespace.js.html b/docs/src/Roo_dialog_namespace.js.html

new file mode 100644 (file)

index 0000000..feb524b
--- /dev/null
+++ b/docs/src/Roo_dialog_namespace.js.html
@@ -0,0 +1 @@
+<html><head><title>Roo/dialog/namespace.js</title><link rel="stylesheet" type="text/css" href="../../css/highlight-js.css"/></head><body class="highlightpage"><code class="jsdoc-pretty"><span class="jsdoc-var">Roo.dialog </span><span class="jsdoc-syntax">= {};</span></code></body></html>
+\ No newline at end of file