From dda3212eeb21b0057fba9c395a16c1ac5b1a71be Mon Sep 17 00:00:00 2001
From: garbash <dor.garbash@gmail.com>
Date: Thu, 2 Oct 2014 09:32:41 +0300
Subject: Undo of commit Merge branch '#62' into Prototype

It broke the input box
---
 index.html           | 4 ----
 scripts/rhizicore.js | 7 -------
 2 files changed, 11 deletions(-)

diff --git a/index.html b/index.html
index 02c510be..01a20d36 100644
--- a/index.html
+++ b/index.html
@@ -49,11 +49,7 @@
 
 
    <div id="suggestion" >
-<<<<<<< HEAD
        <form> <input id="textanalyser" size="70" placeholder="Type here to create a network:" onkeyup="expand(this);"/></form>
-=======
-       <form> <input id = "textanalyser" size= "70" placeholder = "Type here to create a network:" onkeyup = "expand(this);"/></form>
->>>>>>> #62
     </div>
 
     <div class="typeselection">
diff --git a/scripts/rhizicore.js b/scripts/rhizicore.js
index d39471d1..0ac2f29a 100644
--- a/scripts/rhizicore.js
+++ b/scripts/rhizicore.js
@@ -1033,15 +1033,8 @@ function customSize(type) {
 }
 
 function expand(obj){
-<<<<<<< HEAD
     if (!obj.savesize) {
         obj.savesize = obj.size;
     }
     obj.size = Math.max(obj.savesize, obj.value.length);
-=======
-    if (!obj.savesize)
-        obj.savesize = obj.size;
-    obj.size = Math.max(obj.savesize,obj.value.length);
-
->>>>>>> #62
 }
-- 
cgit v1.3.1