From 026688687406b56479970a34e41d56e5e633a1fa Mon Sep 17 00:00:00 2001
From: Patrick Jentsch <p.jentsch@uni-bielefeld.de>
Date: Thu, 11 Jul 2019 09:41:33 +0200
Subject: [PATCH] Remove merge marker.

---
 app/scheduler/views.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/app/scheduler/views.py b/app/scheduler/views.py
index 4f05e70f..a74f6695 100644
--- a/app/scheduler/views.py
+++ b/app/scheduler/views.py
@@ -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 ###')