Merge branch 'ssprofiler' of github.com-kevinz000:kevinz000/Citadel-Station-13 into ssprofiler

2020-02-11 08:38:58 -07:00
parent 3d0f3b79a3 1ec098b39e
commit 92bc142813
1 changed files with 0 additions and 9 deletions
@@ -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