yaffs Fixed a git merge conflict.

[yaffs-docs] / logo / chip_uv_tex2.tga

diff --git a/logo/chip_uv_tex2.tga b/logo/chip_uv_tex2.tga
index 7ab8cd7170076de865dc7d0913bc055f1d90ad3e..19fd4791124233ccbf56be3c388538002f0dd164 100644 (file)
Binary files a/logo/chip_uv_tex2.tga and b/logo/chip_uv_tex2.tga differ