diff options
| author | Anmol Agrawal <anmol1771@gmail.com> | 2014-10-01 21:22:41 +0530 |
|---|---|---|
| committer | Anmol Agrawal <anmol1771@gmail.com> | 2014-10-01 21:22:41 +0530 |
| commit | 66a993bd86d651e20bd6db1c257d0ce0190ad09c (patch) | |
| tree | 50a37b4d1fb744e145b342ccc5d7d3f6f870db36 /index.html | |
| parent | 9f9215499c2e2e248b604515d6741d17e78d9062 (diff) | |
| parent | cb00ca7ca7fff56ab35f0d2d7def54d9725eb601 (diff) | |
Merge branch '#62' into Prototype
Conflicts:
index.html
scripts/rhizicore.js
Diffstat (limited to 'index.html')
| -rw-r--r-- | index.html | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -49,7 +49,11 @@ <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"> |