From: Mirio <opivy@hotmail.de>
Date: Tue, 21 Mar 2017 18:26:28 +0000 (+0100)
Subject: Fix conflict
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=431b49cfd694623386ac10973f3176a6698afbf5;p=xonotic%2Fxonotic-maps.pk3dir.git

Fix conflict
---

431b49cfd694623386ac10973f3176a6698afbf5
diff --cc maps/dance.map.options
index f88cb69e,b4933267..88c416b8
--- 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: 7c
 -Version: 8
++Version: 8a