mirror of
https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git
synced 2024-12-24 02:24:20 +00:00
Remove merge marker.
This commit is contained in:
parent
b82ab23079
commit
0266886874
@ -25,13 +25,8 @@ def scheduler():
|
||||
|
||||
|
||||
def process_job(job):
|
||||
<<<<<<< HEAD
|
||||
input_dir = '/home/pjentsch/%s/input' % 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'
|
||||
print('### Job status changed ###')
|
||||
|
Loading…
Reference in New Issue
Block a user