upload page ui

2017-06-02 15:02:49 -04:00 · 2017-06-02 15:02:49 -04:00 · 292ff8c27f
commit 292ff8c27f
parent a2fb87aab4
2 changed files with 4 additions and 2 deletions
--- a/public/index.html
+++ b/public/index.html
@ -40,11 +40,9 @@
          <th width=20%>Expires in</th>
          <th width=5%>Delete</th>
        </tr>
-
      </table>
    </div>

  </div>
-
 </body>
 </html>
--- a/public/resources/upload.svg
+++ b/public/resources/upload.svg
@ -90,4 +90,8 @@
            </g>
        </g>
    </g>
+<<<<<<< HEAD
 </svg>
+=======
+</svg>
+>>>>>>> upload page ui