fixing conflicts

2016-03-21 18:15:03 -04:00
parent 5e93d7481c
commit b0ddc50380
1 changed files with 27 additions and 29 deletions
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Pmgmail.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Pmgmail.php
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <?php
 namespace ProcessMaker\BusinessModel;

@@ -358,6 +359,3 @@ class Pmgmail {
        $oResponse = $oLabels->setLabelsToUnpauseCase($appUid, $appDelIndex);
    }
 }
-
-
-