Fix merge resolution mistake
authorEileen McNaughton <emcnaughton@wikimedia.org>
Mon, 6 Jun 2022 02:47:11 +0000 (14:47 +1200)
committerEileen McNaughton <emcnaughton@wikimedia.org>
Tue, 7 Jun 2022 00:23:12 +0000 (12:23 +1200)
commit14886f6138a931f6cace24c9ce21436434775910
tree9884b95f3450cd5e087ac9082b030f64c182c350
parent3107f56b33479a1d4ad4b29c8f9a4bffd0af99a5
Fix merge resolution mistake
CRM/Contact/Import/Parser/Contact.php
tests/phpunit/CRM/Contact/Import/Parser/ContactTest.php