Merge pull request #3561 from faheel/patch-1

Fix merge conflict in Plataforma NEO's logo
main
Elbert Alias 4 years ago committed by GitHub
commit ec98590f20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 756 B