merge conflict

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

diff --git a/maps/darkzone.jpg b/maps/darkzone.jpg
index 7781201e1eff577d516ef3f98d287c9f403ddcbc..fcc5afa32b6a25e5cc5778a6305d90138ffd9dd2 100644 (file)
Binary files a/maps/darkzone.jpg and b/maps/darkzone.jpg differ