merge conflict

[xonotic/xonotic-maps.pk3dir.git] / scripts / shaderlist.txt

diff --git a/scripts/shaderlist.txt b/scripts/shaderlist.txt
index c75270b4eab0acc7be3de5a1f2c01c0dc2fae789..951911ba0b3a20a1b3f482d6281e42066a788df9 100644 (file)
--- a/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@ -23,6 +23,7 @@ map_boil
 map_catharsis
 map_courtfun
 map_darkzone
+map_erbium
 map_glowplant
 map_implosion
 map_leave_em_behind