From: Mirio <opivy@hotmail.de>
Date: Sat, 11 Mar 2017 15:13:58 +0000 (+0100)
Subject: Fix conflict
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=aaf566b50eb58da727c6b46695694bb14037cfbf;p=xonotic%2Fxonotic-maps.pk3dir.git

Fix conflict
---

aaf566b50eb58da727c6b46695694bb14037cfbf