Fix conflict

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

diff --git a/scripts/shaderlist.txt b/scripts/shaderlist.txt
index 8328e4c34788c3956183e2ae1f37eb30591dba14..3892df04d035c1a2e52975adfaaf6fcb43e07348 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_geoplanetary
 map_glowplant
 map_implosion