Fix conflict

[xonotic/xonotic-maps.pk3dir.git] / maps / warfare.jpg

diff --git a/maps/warfare.jpg b/maps/warfare.jpg
index d9a12f6a57e22d6a3b7bfa69534336b7433ac2d1..2208f0a4bfb4b1d8a33d443d6ee6b3ea221d60b4 100644 (file)
Binary files a/maps/warfare.jpg and b/maps/warfare.jpg differ