Solved conflicts.
This commit is contained in:
@@ -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.
|
||||
|
Reference in New Issue
Block a user