From 1ec098b39ed5e25b478ce89346cc81b788c237b1 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Tue, 11 Feb 2020 08:00:56 -0700
Subject: [PATCH] shhhh

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

diff --git a/config/config.txt b/config/config.txt
index 32127d4939..c114e1ebf1 100644
--- a/config/config.txt
+++ b/config/config.txt
@@ -500,14 +500,5 @@ FAIL2TOPIC_MAX_FAILS 5
 ## Firewall rule name used on physical server
 FAIL2TOPIC_RULE_NAME _dd_fail2topic
 
-<<<<<<< ours
-=======
-##Default view size, in tiles. Should *always* be square.
-## The alternative square viewport size if you're using a widescreen view size
-## You probably shouldn't ever be changing this, but it's here if you want to.
-DEFAULT_VIEW_SQUARE 15x15
-
-
 ## Enable automatic profiling - Byond 513.1506 and newer only.
 #AUTO_PROFILE
->>>>>>> theirs