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:11:23 -04:00
parent 9ccf707476 d7e4077640
commit 7577b18876
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -1,8 +1,11 @@
.DS_Store .DS_Store
node_modules node_modules
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
public/bundle.js public/bundle.js
======= =======
>>>>>>> add gitignore >>>>>>> add gitignore
=======
>>>>>>> d7e40776401060de6d84771a442ddb6f3ea7175d
static/* static/*
!static/info.txt !static/info.txt

1
public/resources/upload.svg
View File

@ -90,5 +90,4 @@
</g> </g>
</g> </g>
</g> </g>
</svg> </svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB