Fix conflict

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

diff --git a/maps/courtfun.jpg b/maps/courtfun.jpg
index 156dfd1..a9d78cb 100644 (file)
Binary files a/maps/courtfun.jpg and b/maps/courtfun.jpg differ