cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

shhhh

Browse Source
This commit is contained in:
kevinz000
2020-02-11 08:00:56 -07:00
committed by GitHub
parent 3848da5b6b
commit 1ec098b39e
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
config/config.txt
View File

@@ -500,14 +500,5 @@ FAIL2TOPIC_MAX_FAILS 5
## Firewall rule name used on physical server ## Firewall rule name used on physical server
FAIL2TOPIC_RULE_NAME _dd_fail2topic 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. ## Enable automatic profiling - Byond 513.1506 and newer only.
#AUTO_PROFILE #AUTO_PROFILE
>>>>>>> theirs