Skip to content

Commit

Permalink
fix index
Browse files Browse the repository at this point in the history
  • Loading branch information
roberto committed Jul 24, 2015
1 parent 82d644d commit 7182d77
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,7 @@

<div style="font-family:sans-serif;font-size:12px;border:thin solid #bbb;padding:5px;position:absolute;top:10px;left:10px;z-index:10;background-color:rgba(255,255,255,0.8)">
<table id="params"></table>
<<<<<<< HEAD
<div id="log" style="border:thin solid lightGrey;padding:10px"></div>
=======
<!-- <div id="log" style="border:thin solid lightGrey;padding:10px"></div> -->
>>>>>>> origin/master
<button id="restart">Restart</button>
</div>

Expand Down

0 comments on commit 7182d77

Please sign in to comment.