From: Banana Date: Fri, 12 Aug 2011 19:58:46 +0000 (+0200) Subject: missing conflict resolved X-Git-Url: http://91.132.146.200/gitweb/?a=commitdiff_plain;h=63fa94aedc4f08ca34868907f8e8fb854c49bb69;p=klimbim.git missing conflict resolved --- diff --git a/javascript/mif-tree/Demos/index.html b/javascript/mif-tree/Demos/index.html index a0c6615..6fe6570 100755 --- a/javascript/mif-tree/Demos/index.html +++ b/javascript/mif-tree/Demos/index.html @@ -25,9 +25,6 @@
  • Tree other style
  • Add/remove node type demo
  • set icon using url instead class
  • -<<<<<<< HEAD -
  • File tree
  • -=======
  • File Tree ( left since it requires a webserver )
  • DOM Tree
  • HTML Tree
  • @@ -46,7 +43,6 @@
  • cookie storage
  • protected from change node
  • Confirm before Drop
  • ->>>>>>> 26ef1c5e82bbc056bd80d74f1f1bf5b96a7cfc6e