Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pretzel-patches' into 'dev'

Browse Source 
Fixes characters from merge conflict

See merge request crafty-controller/crafty-commander!96
This commit is contained in:
Andrew 2021-11-23 22:21:36 +00:00
commit 17abe01dcc
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/classes/shared/server.py
View File

@ -193,7 +193,6 @@ class Server:
logger.info("Launching Server {} with command {}".format(self.name, self.server_command)) logger.info("Launching Server {} with command {}".format(self.name, self.server_command))
console.info("Launching Server {} with command {}".format(self.name, self.server_command)) console.info("Launching Server {} with command {}".format(self.name, self.server_command))
<<<<<<< app/classes/shared/server.py
if helper.check_file_exists(os.path.join(self.settings['path'], 'eula.txt')): if helper.check_file_exists(os.path.join(self.settings['path'], 'eula.txt')):
f = open(os.path.join(self.settings['path'], 'eula.txt'), 'r') f = open(os.path.join(self.settings['path'], 'eula.txt'), 'r')
line = f.readline().lower() line = f.readline().lower()
@ -222,7 +221,6 @@ class Server:
f.close() f.close()
if helper.is_os_windows(): if helper.is_os_windows():
>>>>>>> app/classes/shared/server.py
logger.info("Windows Detected") logger.info("Windows Detected")
creationflags=subprocess.CREATE_NEW_CONSOLE creationflags=subprocess.CREATE_NEW_CONSOLE
else: else: