Fix conflict

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

diff --git a/maps/boil.jpg b/maps/boil.jpg
index 1b966cc0612d2050d5cb4ce52a4236ba3a601e54..b0579983c243295e7485e78b7528b9ba86c46ba0 100644 (file)
Binary files a/maps/boil.jpg and b/maps/boil.jpg differ