./all clean: also back out of merge conflicts

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

diff --git a/misc/logos/icons_ico/xonotic_48.ico b/misc/logos/icons_ico/xonotic_48.ico
index 9f82051d839bcdec580c4c8a0747c76affc40e7f..7cf932a86b391f8b60effbfdddd94acb0dbc3197 100644 (file)
Binary files a/misc/logos/icons_ico/xonotic_48.ico and b/misc/logos/icons_ico/xonotic_48.ico differ