Merge pull request #23380 from eileenmcnaughton/import_conflict
authorSeamus Lee <seamuslee001@gmail.com>
Thu, 5 May 2022 23:06:28 +0000 (09:06 +1000)
committerGitHub <noreply@github.com>
Thu, 5 May 2022 23:06:28 +0000 (09:06 +1000)
commitaa3ca5c0169e18df3e1935533109097dfebab6ad
treef05746d71d1bc32d1c7aa2994f240087698f688b
parentfeb8b50f1872101cb632b02587445ce3be17bbb2
parentda8d3d49ea50b3b00e613d359180e7a6e666c93f
Merge pull request #23380 from eileenmcnaughton/import_conflict

[REF] [Import] Remove another good intention - import 'conflicts'
CRM/Contact/Import/Parser/Contact.php