Fix conflict
authorMirio <opivy@hotmail.de>
Fri, 10 Mar 2017 20:35:59 +0000 (21:35 +0100)
committerMirio <opivy@hotmail.de>
Fri, 10 Mar 2017 20:35:59 +0000 (21:35 +0100)
1  2 
scripts/shaderlist.txt

index 951911ba0b3a20a1b3f482d6281e42066a788df9,8328e4c34788c3956183e2ae1f37eb30591dba14..3892df04d035c1a2e52975adfaaf6fcb43e07348
@@@ -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