From 292ff8c27fe78b102bb6250eca47d7b2de6023f3 Mon Sep 17 00:00:00 2001
From: Daniela Arcese <dnarcese@gmail.com>
Date: Fri, 2 Jun 2017 15:02:49 -0400
Subject: [PATCH] upload page ui

---
 public/index.html           | 2 --
 public/resources/upload.svg | 4 ++++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/public/index.html b/public/index.html
index 987ae210..ca7683d4 100644
--- 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>
diff --git a/public/resources/upload.svg b/public/resources/upload.svg
index d731adba..a1a3d06a 100644
--- a/public/resources/upload.svg
+++ b/public/resources/upload.svg
@@ -90,4 +90,8 @@
             </g>
         </g>
     </g>
+<<<<<<< HEAD
 </svg>
+=======
+</svg>
+>>>>>>> upload page ui