solving conflicts

2015-06-25 15:35:29 -04:00
parent e72277f964
commit 0fb6241bd9
10 changed files with 84 additions and 44 deletions
--- a/workflow/engine/classes/model/map/EmailEventMapBuilder.php
+++ b/workflow/engine/classes/model/map/EmailEventMapBuilder.php
@@ -77,7 +77,7 @@ class EmailEventMapBuilder

        $tMap->addColumn('EMAIL_EVENT_SUBJECT', 'EmailEventSubject', 'string', CreoleTypes::VARCHAR, false, 150);

-        $tMap->addColumn('EMAIL_EVENT_BODY', 'EmailEventBody', 'string', CreoleTypes::LONGVARCHAR, true, null);
+        $tMap->addColumn('PRF_UID', 'PrfUid', 'string', CreoleTypes::VARCHAR, false, 32);

    } // doBuild()