missing conflict resolved

diff --git a/javascript/mif-tree/Demos/index.html b/javascript/mif-tree/Demos/index.html
index a0c6615e9ddc578eb8c2f491b83e965d8d26f22a..6fe6570b7a7b0629a2e8ddb8a7f4931049964744 100755 (executable)
--- a/javascript/mif-tree/Demos/index.html
+++ b/javascript/mif-tree/Demos/index.html
@@ -25,9 +25,6 @@
                                        <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>
@@ -46,7 +43,6 @@
                                        <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">