Revert "Need to remove merge marks"

This reverts commit 9cccfca70a.
4 years ago · 10757f52a7
parent 9cccfca70a
commit 10757f52a7
1 changed files with 3 additions and 0 deletions
--- a/config.py
+++ b/config.py
@ -316,7 +316,10 @@ def build_config(_config_file):
                        'MODE': config.get(section, 'MODE'),
                        'ENABLED': config.getboolean(section, 'ENABLED'),
                        'NETWORK_ID': config.getint(section, 'NETWORK_ID').to_bytes(4, 'big'),
+<<<<<<< HEAD
+=======
                        #'OVERRIDE_SERVER_ID': config.getint(section, 'OVERRIDE_SERVER_ID').to_bytes(4, 'big'),
+>>>>>>> hrt
                        'IP': config.get(section, 'IP'),
                        'PORT': config.getint(section, 'PORT'),
                        'PASSPHRASE': bytes(config.get(section, 'PASSPHRASE').ljust(20,'\x00')[:20], 'utf-8'),