Fix conflict

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

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