merge conflict
authorMirio <opivy@hotmail.de>
Mon, 20 Feb 2017 12:27:59 +0000 (13:27 +0100)
committerMirio <opivy@hotmail.de>
Mon, 20 Feb 2017 12:27:59 +0000 (13:27 +0100)
1  2 
maps/dance.map.options

diff --combined maps/dance.map.options
index 0d51f8a398c0592fab97a3341668f4875c4ca7b7,cbbb06d0baf2c2f49669ff66150d6f5af98ce900..3666943673322e8ae6fcd08f43257af9ecce6f21
@@@ -3,4 -3,4 +3,4 @@@
  -light + -bounce 8 -dirtscale 2 -gamma 0.7
  -minimap +
  -sRGB
- Version: 6
 -Version: 6b
++Version: 7