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/resources/upload.svg
+++ b/public/resources/upload.svg
@ -90,4 +90,8 @@
            </g>
        </g>
    </g>
+<<<<<<< HEAD
 </svg>
+=======
+</svg>
+>>>>>>> upload page ui