solving conflicts

This commit is contained in:
marcelo.cuiza
2015-06-25 15:59:34 -04:00
parent 0fb6241bd9
commit 5180199058
6 changed files with 166 additions and 29 deletions

View File

@@ -42,7 +42,7 @@ debug = 1
web-entry-event = "ProcessMaker\Services\Api\Project\WebEntryEvent"
message-event-definition = "ProcessMaker\Services\Api\Project\MessageEventDefinition"
script-task = "ProcessMaker\Services\Api\Project\ScriptTask"
email-event = "ProcessMaker\Services\Api\Project\EmailEvent"
email-event = "ProcessMaker\Services\Api\Project\EmailEvent"
[alias: projects]
project = "ProcessMaker\Services\Api\Project"