Commit 0515644d authored by André Anjos's avatar André Anjos 💬
Browse files

Fix missed conflict

parent 00459999
Pipeline #19459 failed with stages
in 98 minutes and 6 seconds
......@@ -390,12 +390,8 @@ def main(user_input=None):
parts = [
WorkerController.ERROR,
b"Unknown job: %s" % job_id
<<<<<<< HEAD
]
send_multipart(socket, parts)
=======
])
>>>>>>> More py3k fixes
continue
# Kill the processing thread
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment