Solved conflicts.

This commit is contained in:
arturoacevedob
2017-11-28 17:16:35 -06:00
parent 3abdbe3b47
commit 0141106fea
9 changed files with 11 additions and 8 deletions

View File

@@ -209,4 +209,4 @@ From [SVGporn](https://github.com/gilbarbara/logos/) - CC0
IBM, Yammer, Android, Authy, ClourFlare, CodePen, DigitalOcean, Discord, AirBnB, WiFi, delicious, opensource, Patreon
Where possible, they retain their original licenses. Some logos may be subject to copyright and trademark laws, but these files are small enough to memorise.
Where possible, they retain their original licenses. Some logos may be subject to copyright and trademark laws, but these files are small enough to memorise.