fix bad merge
[fanfix.git] / resources / jexer_logo_128.png
resources/jexer_logo_128.png