From 4239566cf0faecc47280722e88a477dce69172eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Kl=C3=A4ger?=
 <kklaeger@users.noreply.github.com>
Date: Wed, 29 Nov 2017 08:55:05 +0100
Subject: [PATCH] TSK-43 Add businessProcessId and parentBusinessProcessId to
 Task and update TaskMapper as well as task.sql

---
 .../src/main/java/pro/taskana/impl/TaskServiceImpl.java        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskServiceImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskServiceImpl.java
index a0c3b4692..b47441776 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskServiceImpl.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskServiceImpl.java
@@ -33,7 +33,10 @@ public class TaskServiceImpl implements TaskService {
     private static final String ID_PREFIX_OBJECTR_EFERENCE = "ORI";
     private static final String ID_PREFIX_TASK = "TKI";
     private static final String ID_PREFIX_BUSINESS_PROCESS = "BPI";
+<<<<<<< HEAD
     private static final String TYPE_MANUAL = "MANUAL";
+=======
+>>>>>>> TSK-43 Add businessProcessId and parentBusinessProcessId to Task and
 
     private TaskanaEngine taskanaEngine;
     private TaskanaEngineImpl taskanaEngineImpl;