./all clean: also back out of merge conflicts

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

diff --git a/misc/logos/icons_ico/xonotic_64.ico b/misc/logos/icons_ico/xonotic_64.ico
index f9113474f9191f33523775be71c0946b30f54842..a1d99e89153967b2078cfbfb672605f4d25fd890 100644 (file)
Binary files a/misc/logos/icons_ico/xonotic_64.ico and b/misc/logos/icons_ico/xonotic_64.ico differ