Update get_merge_conflicts api
authoreileen <emcnaughton@wikimedia.org>
Mon, 3 Jun 2019 03:42:33 +0000 (15:42 +1200)
committereileen <emcnaughton@wikimedia.org>
Thu, 6 Jun 2019 02:08:14 +0000 (14:08 +1200)
commit712ee28f835ef2b7df22648c87f0f1e18fcbf6d2
treef2aaad40b166ce8365164670f98cc5cd8db1db0d
parentaefc291e1e76037e296b80fdacd0652dc38045aa
Update get_merge_conflicts api

Increase result nuance in response to review
Civi/Test/ContactTestTrait.php
api/v3/Contact.php
tests/phpunit/CRMTraits/Custom/CustomDataTrait.php
tests/phpunit/api/v3/ContactTest.php