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

Fix conflict
---

d6349f6ee9ab78e203d8e8cfb9df980641fe979d
diff --cc scripts/shaderlist.txt
index 4cff15d0,3892df04..6b58337f
--- a/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@@ -19,7 -18,8 +18,9 @@@ liquids_lav
  liquids_slime
  liquids_water
  logos
 +map_aurora
+ map_atelier
+ map_boil
  map_catharsis
  map_courtfun
  map_darkzone