merge conflict

diff --cc scripts/shaderlist.txt
index 5efb2a0551503cc5b4ef7d62321a2c6a58a80af5,c75270b4eab0acc7be3de5a1f2c01c0dc2fae789..951911ba0b3a20a1b3f482d6281e42066a788df9
--- 1/scripts/shaderlist.txt
--- 2/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@@ -23,8 -23,6 +23,7 @@@ map_boi
  map_catharsis
  map_courtfun
  map_darkzone
- map_g-23
 +map_erbium
  map_glowplant
  map_implosion
  map_leave_em_behind