fixing conflicts

2017-06-04 14:11:23 -04:00 · 2017-06-04 14:11:23 -04:00 · 7577b18876
commit 7577b18876
parent 9ccf707476 d7e4077640
2 changed files with 3 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,8 +1,11 @@
 .DS_Store
 node_modules
 <<<<<<< HEAD
+<<<<<<< HEAD
 public/bundle.js
 =======
 >>>>>>> add gitignore
+=======
+>>>>>>> d7e40776401060de6d84771a442ddb6f3ea7175d
 static/*
 !static/info.txt
--- a/public/resources/upload.svg
+++ b/public/resources/upload.svg
@ -90,5 +90,4 @@
            </g>
        </g>
    </g>
-
 </svg>