From: Mirio <opivy@hotmail.de>
Date: Mon, 20 Feb 2017 12:27:59 +0000 (+0100)
Subject: merge conflict
X-Git-Tag: xonotic-v0.8.2~95^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=dd053de409ac407511e9f06eac723b3494889319;p=xonotic%2Fxonotic-maps.pk3dir.git

merge conflict
---

dd053de409ac407511e9f06eac723b3494889319
diff --cc maps/dance.map.options
index 0d51f8a3,cbbb06d0..36669436
--- a/maps/dance.map.options
+++ b/maps/dance.map.options
@@@ -3,4 -3,4 +3,4 @@@
  -light + -bounce 8 -dirtscale 2 -gamma 0.7
  -minimap +
  -sRGB
- Version: 6
 -Version: 6b
++Version: 7