cleanup

diff --cc javascript/mif-tree/Demos/index.html
index c67d6e1eeb52f564836740f3db108ee95c493402,6fe6570b7a7b0629a2e8ddb8a7f4931049964744..a0c6615e9ddc578eb8c2f491b83e965d8d26f22a
--- 1/javascript/mif-tree/Demos/index.html
--- 2/javascript/mif-tree/Demos/index.html
+++ b/javascript/mif-tree/Demos/index.html
@@@ -25,7 -25,24 +25,28 @@@
                                        <li><a href="TreeOtherStyle/index.html">Tree other style</a></li>
                                        <li><a href="changeType/index.html">Add/remove node type demo</a></li>
                                        <li><a href="IconUrl/index.html">set icon using url instead class</a></li>
++<<<<<<< HEAD
 +                                      <li><a href="FileTree/index.html">File tree</a></li>
++=======
+                                       <li><a href="">File Tree ( left since it requires a webserver )</a></li>
+                                       <li><a href="DOMTree/index.html">DOM Tree</a></li>
+                                       <li><a href="HTMLTree/index.html">HTML Tree</a></li>
+                                       <li><a href="ExpandTo/index.html">Using expandTo property demo</a></li>
+                                       <li><a href="Hide/index.html">Hidden property</a></li>
+                                       <li><a href="KeyNav/index.html">Key navigation implementation demo</a></li>
+                                       <li><a href="CheckboxSimple/index.html">Tree simple checkboxes</a></li>
+                                       <li><a href="CheckboxDeps/index.html">Tree dependences checkboxes</a></li>
+                                       <li><a href="DragAndDrop/index.html">Tree drag'n'drop</a></li>
+                                       <li><a href="DnD/index.html">D'n'd with drop confirmation</a></li>
+                                       <li><a href="Rename/index.html">Rename Node</a></li>
+                                       <li><a href="SortableTree/index.html">sortable tree</a></li>
+                                       <li><a href="AddNode/index.html">Add node</a></li>
+                                       <li><a href="AddNode2/index.html">Another add node demo</a></li>
+                                       <li><a href="reloadChildren/index.html">reload children and update clicked node name</a></li>
+                                       <li><a href="CookieStorage/index.html">cookie storage</a></li>
+                                       <li><a href="ProtectedNode/index.html">protected from change node</a></li>
+                                       <li><a href="DropConfirm/index.html">Confirm before Drop</a></li>
++>>>>>>> 26ef1c5e82bbc056bd80d74f1f1bf5b96a7cfc6e
                                </ul>
                        </div>
                        <div id="footer">