Fixing conflicts

2016-03-22 09:29:45 -04:00
parent b0ddc50380
commit 7247ff3b16
1 changed files with 0 additions and 1 deletions
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Pmgmail.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Pmgmail.php
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <?php
 namespace ProcessMaker\BusinessModel;