Cleanup merge conflicts

This commit is contained in:
Adam Hopkins 2022-02-22 09:23:59 +02:00
parent 65c02e24e1
commit 964e0b09f4
No known key found for this signature in database
GPG Key ID: 9F85EE6C807303FB

View File

@ -175,7 +175,6 @@ Or, a path to a directory to run as a simple HTTP server:
"unix": self.args.unix, "unix": self.args.unix,
"verbosity": self.args.verbosity or 0, "verbosity": self.args.verbosity or 0,
"workers": self.args.workers, "workers": self.args.workers,
"version": version,
"auto_tls": self.args.auto_tls, "auto_tls": self.args.auto_tls,
} }