From: Mirio <opivy@hotmail.de>
Date: Tue, 7 Mar 2017 12:37:12 +0000 (+0100)
Subject: merge conflict
X-Git-Tag: xonotic-v0.8.2~78^2~12
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0908b1c6a711ee325908c82333ec9c08a2e61a03;p=xonotic%2Fxonotic-maps.pk3dir.git

merge conflict
---

0908b1c6a711ee325908c82333ec9c08a2e61a03
diff --cc scripts/shaderlist.txt
index 5efb2a05,c75270b4..951911ba
--- a/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@@ -23,8 -23,6 +23,7 @@@ map_boi
  map_catharsis
  map_courtfun
  map_darkzone
 +map_erbium
- map_g-23
  map_glowplant
  map_implosion
  map_leave_em_behind