Skip to content
Snippets Groups Projects
Commit 02668868 authored by Patrick Jentsch's avatar Patrick Jentsch
Browse files

Remove merge marker.

parent b82ab230
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 5 deletions
app/scheduler/views.py
+ 0
− 5
View file @ 02668868
...@@ -25,13 +25,8 @@ def scheduler(): ...@@ -25,13 +25,8 @@ def scheduler():
def process_job(job): def process_job(job):
<<<<<<< HEAD
input_dir = '/home/pjentsch/%s/input' % job['service'] input_dir = '/home/pjentsch/%s/input' % job['service']
output_dir = '/home/pjentsch/%s/output' % job['service'] output_dir = '/home/pjentsch/%s/output' % job['service']
=======
input_dir = '/home/pjentsch/ocr/input'
output_dir = '/home/pjentsch/ocr/output'
>>>>>>> e6446834b4c4251154497a7104cd84d1188be981
job['status'] = 'running' job['status'] = 'running'
print('### Job status changed ###') print('### Job status changed ###')
......
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