From 7356e13df75f36e14e520f6bcc50a7576b8ea04f Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Mon, 31 Aug 2020 23:56:55 -0400
Subject: [PATCH] Update config.txt

---
 config/example/config.txt | 4 ----
 1 file changed, 4 deletions(-)

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