From: Mirio <opivy@hotmail.de>
Date: Tue, 21 Mar 2017 14:01:55 +0000 (+0100)
Subject: Fix conflict
X-Git-Tag: xonotic-v0.8.2~20^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F94%2Fhead;p=xonotic%2Fxonotic-maps.pk3dir.git

Fix conflict
---

f2ac31fa826e6304d9d96f3e71d3b70c1797e15a
diff --cc maps/dance.map.options
index a656da27,8e81a0ad..b4933267
--- 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: 8
 -Version: 7c
++Version: 8