sporada/nopaque
1
0
Fork 0
mirror of https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git synced 2025-11-04 04:12:45 +00:00
Code Issues Projects Releases Wiki Activity

Remove merge marker.

Browse Source
This commit is contained in:
Patrick Jentsch
2019-07-11 09:41:33 +02:00
parent b82ab23079
commit 0266886874
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/scheduler/views.py
View File

@@ -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 ###')