From: Mirio <opivy@hotmail.de>
Date: Fri, 11 Sep 2015 18:09:21 +0000 (+0200)
Subject: fix merge conflicts
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2fa0ac3404a2ebfc08fcc1724cf5322b522ab3dc;p=xonotic%2Fxonotic-maps.pk3dir.git

fix merge conflicts
---

2fa0ac3404a2ebfc08fcc1724cf5322b522ab3dc
diff --cc maps/catharsis.map.options
index 6b876be5,b0135452..7bca43e2
--- a/maps/catharsis.map.options
+++ b/maps/catharsis.map.options
@@@ -3,4 -3,4 +3,4 @@@
  -vis +
  -minimap -scale 0.9 +
  -sRGB
- Version: 2b
 -Version: 2c
++Version: 2c