summaryrefslogtreecommitdiff
path: root/index.html
diff options
context:
space:
mode:
authorgarbash <dor.garbash@gmail.com>2014-10-02 09:32:41 +0300
committergarbash <dor.garbash@gmail.com>2014-10-02 09:32:41 +0300
commitdda3212eeb21b0057fba9c395a16c1ac5b1a71be (patch)
tree3e3455e4b55aed5e1049e234f1a9ed34f5e2593b /index.html
parent66a993bd86d651e20bd6db1c257d0ce0190ad09c (diff)
Undo of commit Merge branch '#62' into Prototype
It broke the input box
Diffstat (limited to 'index.html')
-rw-r--r--index.html4
1 files changed, 0 insertions, 4 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">