merge conflict

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

diff --git a/maps/warfare.jpg b/maps/warfare.jpg
index efad6f4b1a1e3aa6b32a027d24739f47069bce9c..2c2d612577c61f219d1b3883197593295f149055 100644 (file)
Binary files a/maps/warfare.jpg and b/maps/warfare.jpg differ