From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Sun, 28 Apr 2019 22:34:25 +0000 (+1200)
Subject: Merge pull request #14148 from eileenmcnaughton/dedupe8
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=07d7847fc82455fa044cb5ef972477ae03149aa4;p=civicrm-core.git

Merge pull request #14148 from eileenmcnaughton/dedupe8

[REF] extract getConflicts function
---

07d7847fc82455fa044cb5ef972477ae03149aa4