From: Mirio <opivy@hotmail.de>
Date: Fri, 10 Mar 2017 20:35:59 +0000 (+0100)
Subject: Fix conflict
X-Git-Tag: xonotic-v0.8.2~78^2
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=36183325cdadf0163e26acf6862f93fe9f028fe8;p=xonotic%2Fxonotic-maps.pk3dir.git

Fix conflict
---

36183325cdadf0163e26acf6862f93fe9f028fe8
diff --cc scripts/shaderlist.txt
index 951911ba,8328e4c3..3892df04
--- a/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@@ -23,7 -23,7 +23,8 @@@ map_boi
  map_catharsis
  map_courtfun
  map_darkzone
 +map_erbium
+ map_geoplanetary
  map_glowplant
  map_implosion
  map_leave_em_behind