summaryrefslogtreecommitdiff
path: root/index.html
diff options
context:
space:
mode:
Diffstat (limited to 'index.html')
-rw-r--r--index.html14
1 files changed, 9 insertions, 5 deletions
diff --git a/index.html b/index.html
index 9685c594..02c510be 100644
--- a/index.html
+++ b/index.html
@@ -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">
@@ -91,14 +95,14 @@
</div>
</div>
<div class="debug-ui-left">
- <div class="load">
+ <div class="local-storage-load">
<a href="#">Load</a>
</div>
</div>
- <div class="debug-ui-left">
- <div class="deliverabletest">
- <a href="#">Load deliverables</a>
- </div>
+ <div class="debug-ui-row">
+ <form>
+ Load <input type="file" class="file-load" />
+ </form>
</div>
<div class="debug-ui-left">
<div class="debug">debug</div>