natty
/
fox-send
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixing conflicts

This commit is contained in:
Daniela Arcese 2017-06-04 14:07:42 -04:00
parent f56961b245
commit 9ccf707476
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/resources/upload.svg
View File

@ -90,8 +90,5 @@
</g>
</g>
</g>
<<<<<<< HEAD
</svg>
=======
</svg>
>>>>>>> upload page ui

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB