From 9ccf70747627e4a7c016ee7564fcf327e508e1b3 Mon Sep 17 00:00:00 2001
From: Daniela Arcese <dnarcese@gmail.com>
Date: Sun, 4 Jun 2017 14:07:42 -0400
Subject: [PATCH] fixing conflicts

---
 public/resources/upload.svg | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/public/resources/upload.svg b/public/resources/upload.svg
index a1a3d06a..72c1cc09 100644
--- a/public/resources/upload.svg
+++ b/public/resources/upload.svg
@@ -90,8 +90,5 @@
             </g>
         </g>
     </g>
-<<<<<<< HEAD
+
 </svg>
-=======
-</svg>
->>>>>>> upload page ui