Fix bad merge
[cascardo/ema.git] / media / imgs / logo.png
media/imgs/logo.png