Merge pull request #14394 from eileenmcnaughton/merge_get_conflicts
authorEileen McNaughton <emcnaughton@wikimedia.org>
Thu, 6 Jun 2019 12:35:42 +0000 (00:35 +1200)
committerGitHub <noreply@github.com>
Thu, 6 Jun 2019 12:35:42 +0000 (00:35 +1200)
commit9df8d506c6fd270079f4b916cd948831d8b38121
tree0a4718100fec0326d4aba6447ae879246f6e10cf
parent115a6e2a976f359927eef6282fcd3cbf6dd31394
parent712ee28f835ef2b7df22648c87f0f1e18fcbf6d2
Merge pull request #14394 from eileenmcnaughton/merge_get_conflicts

Add Contact.get_merge_conflicts api
tests/phpunit/CRMTraits/Custom/CustomDataTrait.php
tests/phpunit/api/v3/ContactTest.php