conflicts resolution

Browse Source

...

This commit is contained in:

danteloayza

2015-03-30 11:00:04 -04:00

parent ad805f9038

commit d4ecc6c1a4

4 changed files with 2380 additions and 2120 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1277

workflow/engine/src/ProcessMaker/BusinessModel/User.php

File diff suppressed because it is too large Load Diff