Merge pull request #15829 from eileenmcnaughton/dedupe3
authorSeamus Lee <seamuslee001@gmail.com>
Fri, 10 Jan 2020 23:35:05 +0000 (10:35 +1100)
committerGitHub <noreply@github.com>
Fri, 10 Jan 2020 23:35:05 +0000 (10:35 +1100)
commit300f9c7335deeb3ee0157d666c57bc17abc64bb5
treeae1ba08a941077c9367a27685308fc2f07c1c850
parent95dfd04f4630e82e67201467d57c78ef0beb2dc1
parent403400d940e94dcb5cec6031e35ec1d2d5e83e95
Merge pull request #15829 from eileenmcnaughton/dedupe3

Add resolved to return array for get_conflicts
CRM/Dedupe/Merger.php
api/v3/Contact.php
tests/phpunit/api/v3/ContactTest.php