Fix merge resolution issue
authorEileen McNaughton <emcnaughton@wikimedia.org>
Tue, 7 Jun 2022 01:11:32 +0000 (13:11 +1200)
committerEileen McNaughton <emcnaughton@wikimedia.org>
Tue, 7 Jun 2022 01:26:17 +0000 (13:26 +1200)
commit79e1afb8069f622e4842aff945468986ba8849f1
tree9df283f1f8117c7fe1d357ebf03758afd14160d0
parent14886f6138a931f6cace24c9ce21436434775910
Fix merge resolution issue
CRM/Activity/Import/Parser/Activity.php
CRM/Contact/Import/Parser/Contact.php
CRM/Import/Parser.php
CRM/Member/Import/Parser/Membership.php
tests/phpunit/CRM/Activity/Import/Parser/ActivityTest.php