Merge pull request #12193 from eileenmcnaughton/dedupe
authorMonish Deb <monish.deb@jmaconsulting.biz>
Wed, 6 Jun 2018 19:10:27 +0000 (00:40 +0530)
committerGitHub <noreply@github.com>
Wed, 6 Jun 2018 19:10:27 +0000 (00:40 +0530)
commit696f42d6a635a90d5be909ad98d65c1aa2cba42d
tree3ca6051d61bc103b516ebf310220378bfb1a6f69
parent8df04fbec4927b2e8fe765c825fdd31fc81632e0
parentb5a6c6c508d243a0d424ba1e4b62853045279a3c
Merge pull request #12193 from eileenmcnaughton/dedupe

Fix non-display of conflicts after batch dedupe from dedupe screen
CRM/Dedupe/Merger.php