Fix conflict

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

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