./all clean: also back out of merge conflicts

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

diff --git a/misc/logos/icons_ico/xonotic_16.ico b/misc/logos/icons_ico/xonotic_16.ico
index 77fd48fe434b37c3f44cc086130592175f190061..e6047f9c5788ba31f7b91d9f1ec6be8463c3480f 100644 (file)
Binary files a/misc/logos/icons_ico/xonotic_16.ico and b/misc/logos/icons_ico/xonotic_16.ico differ