Fix conflict

[xonotic/xonotic-maps.pk3dir.git] / maps / dance.map.options

diff --git a/maps/dance.map.options b/maps/dance.map.options
index a656da270c6b895cf16d516c50ec313669456d58..b4933267fec1c72a9722af812959098ca7395d80 100644 (file)
--- a/maps/dance.map.options
+++ b/maps/dance.map.options
@@ -3,4 +3,4 @@
 -light + -bounce 8 -dirtscale 2 -gamma 0.7
 -minimap +
 -sRGB
 -light + -bounce 8 -dirtscale 2 -gamma 0.7
 -minimap +
 -sRGB

-Version: 8
+Version: 8
\ No newline at end of file