CRM-18517 get conflicts dependent on mode
authoreileen <emcnaughton@wikimedia.org>
Mon, 16 May 2016 22:35:46 +0000 (10:35 +1200)
committereileen <emcnaughton@wikimedia.org>
Mon, 16 May 2016 22:59:26 +0000 (10:59 +1200)
commite6f54bf502dd8e51e1b235ab5eee9f65f03ed2b2
tree8163ee72f25c7adf1d844cd836700bc64e40fa1d
parenta45614cc68477ee10182db87cab5596ac3514189
CRM-18517 get conflicts dependent on mode
CRM/Dedupe/Merger.php