./all clean: also back out of merge conflicts

[xonotic/xonotic.git] / misc / logos / icons_ico / xonotic_128.ico

diff --git a/misc/logos/icons_ico/xonotic_128.ico b/misc/logos/icons_ico/xonotic_128.ico
index 7b64c4df7347a93bfb072ff53c7bf4e19addbc08..c5889032201361014fc773aaacabd2e0c9ed3e19 100644 (file)
Binary files a/misc/logos/icons_ico/xonotic_128.ico and b/misc/logos/icons_ico/xonotic_128.ico differ