Merge branch 'master' of github.com:Ultimaker/Cura

This commit is contained in:
Ghostkeeper 2017-12-18 11:25:50 +01:00
commit 39d235c7b2
No known key found for this signature in database
GPG Key ID: 5252B696FB5E7C7A

View File

@ -519,7 +519,6 @@ class CuraApplication(QtApplication):
super().addCommandLineOptions(parser, parsed_command_line = parsed_command_line)
parser.add_argument("file", nargs="*", help="Files to load after starting the application.")
parser.add_argument("--single-instance", action="store_true", default=False)
parser.add_argument("--headless", action = "store_true", default=False)
# Set up a local socket server which listener which coordinates single instances Curas and accepts commands.
def _setUpSingleInstanceServer(self):