merge conflict

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

diff --git a/maps/dance.map.options b/maps/dance.map.options
index cbbb06d0baf2c2f49669ff66150d6f5af98ce900..3666943673322e8ae6fcd08f43257af9ecce6f21 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: 6b
+Version: 7
\ No newline at end of file