From c811c568a5d9c7eb66f858fa47e167ccf261e69c Mon Sep 17 00:00:00 2001 From: Andrew Date: Tue, 23 Nov 2021 17:16:33 -0500 Subject: [PATCH] Fix Merge issues --- app/classes/shared/server.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py index fbb19dab..9dcb7646 100644 --- a/app/classes/shared/server.py +++ b/app/classes/shared/server.py @@ -193,7 +193,6 @@ class Server: logger.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')): f = open(os.path.join(self.settings['path'], 'eula.txt'), 'r') line = f.readline().lower() @@ -222,7 +221,6 @@ class Server: f.close() if helper.is_os_windows(): ->>>>>>> app/classes/shared/server.py logger.info("Windows Detected") creationflags=subprocess.CREATE_NEW_CONSOLE else: