Update config.txt

This commit is contained in:
Novacat
2020-08-31 23:56:55 -04:00
committed by GitHub
parent 1fe31b3446
commit 7356e13df7

View File

@@ -551,11 +551,7 @@ ENABLE_NIGHT_SHIFTS
# Uncomment to allow links of the following kinds. # # Uncomment to allow links of the following kinds. #
# ALLOW_BYOND_LINKS # ALLOW_BYOND_LINKS
# ALLOW_DISCORD_LINKS # ALLOW_DISCORD_LINKS
<<<<<<< HEAD
ALLOW_URL_LINKS
=======
ALLOW_URL_LINKS ALLOW_URL_LINKS
# Control which submaps are loaded for the Dynamic Engine system # Control which submaps are loaded for the Dynamic Engine system
ENGINE_MAP Supermatter Engine,Edison's Bane ENGINE_MAP Supermatter Engine,Edison's Bane
>>>>>>> 04ce5a1... Merge pull request #7588 from zekesulastin/patch-1