From 18f68621ffc55506a18c619d0cdd08f1a53977f2 Mon Sep 17 00:00:00 2001
From: "Paula V. Quispe" <paula.quispe@colosa.com>
Date: Fri, 22 Jul 2016 11:00:39 -0400
Subject: [PATCH] .

---
 workflow/engine/classes/class.wsTools.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/workflow/engine/classes/class.wsTools.php b/workflow/engine/classes/class.wsTools.php
index 9f1840216..d02fa3a8f 100755
--- a/workflow/engine/classes/class.wsTools.php
+++ b/workflow/engine/classes/class.wsTools.php
@@ -3349,5 +3349,4 @@ class workspaceTools
         CLI::logging($message);
     }
 
->>>>>>> HOR-1259: Migrate Itee to Dummytask
 }