From 335deed54a2fdd4e15733e38ca7bdbf36a7ab787 Mon Sep 17 00:00:00 2001
From: Will Abson <will.abson@alfresco.com>
Date: Tue, 15 Nov 2016 17:32:26 +0000
Subject: [PATCH] Remove diff output

Refs #849
---
 .../activiti-process-instance-details.component.html        | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.html b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.html
index 9cb9341be6..2172453f99 100644
--- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.html
+++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.html
@@ -4,12 +4,8 @@
     <activiti-process-instance-header [processInstance]="processInstanceDetails" (processCancelled)="bubbleProcessCancelled()" #activitiprocessheader></activiti-process-instance-header>
     <div class="mdl-grid">
         <div class="mdl-cell mdl-cell--8-col">
-<<<<<<< HEAD
             <activiti-process-instance-tasks [processInstanceDetails]="processInstanceDetails" (taskFormCompleted)="bubbleTaskFormCompleted()" #activitiprocesstasks></activiti-process-instance-tasks>
-=======
-            <activiti-process-instance-tasks [processInstanceId]="processInstanceDetails.id" (taskFormCompleted)="onTaskFormCompleted()" #activitiprocesstasks></activiti-process-instance-tasks>
->>>>>>> New tests for processlist components
-        </div>
+=       </div>
         <div class="mdl-cell mdl-cell--4-col">
             <activiti-process-instance-comments [processInstanceId]="processInstanceDetails.id" #activitiprocesscomments></activiti-process-instance-comments>
         </div>