vcs.fsf.org Git - civicrm-core.git/commit

author	Eileen McNaughton <emcnaughton@wikimedia.org>
	Thu, 5 May 2022 19:59:07 +0000 (07:59 +1200)
committer	Eileen McNaughton <emcnaughton@wikimedia.org>
	Thu, 5 May 2022 20:28:25 +0000 (08:28 +1200)
commit	da8d3d49ea50b3b00e613d359180e7a6e666c93f
tree	da914d841c1d0de0e00d1593b4fe35aebfe79c2f	tree \| snapshot (zip tar.gz)
parent	99b43f285029a79b15f54a196a8878896d7586f7	commit \| diff

[REF] [Import] Remove another good intention - conflict

There is all sorts of handling for 'conflict' - but a conflict return code is never
generated

30 files changed:

CRM/Activity/Import/Form/Preview.php		diff \| blob \| blame \| history
CRM/Activity/Import/Form/Summary.php		diff \| blob \| blame \| history
CRM/Activity/Import/Parser/Activity.php		diff \| blob \| blame \| history
CRM/Contact/Import/Form/Preview.php		diff \| blob \| blame \| history
CRM/Contact/Import/Form/Summary.php		diff \| blob \| blame \| history
CRM/Contact/Import/ImportJob.php		diff \| blob \| blame \| history
CRM/Contact/Import/Parser/Contact.php		diff \| blob \| blame \| history
CRM/Contribute/Import/Form/Preview.php		diff \| blob \| blame \| history
CRM/Contribute/Import/Form/Summary.php		diff \| blob \| blame \| history
CRM/Contribute/Import/Parser/Contribution.php		diff \| blob \| blame \| history
CRM/Custom/Import/Form/Preview.php		diff \| blob \| blame \| history
CRM/Custom/Import/Parser/Api.php		diff \| blob \| blame \| history
CRM/Event/Import/Form/Preview.php		diff \| blob \| blame \| history
CRM/Event/Import/Form/Summary.php		diff \| blob \| blame \| history
CRM/Event/Import/Parser/Participant.php		diff \| blob \| blame \| history
CRM/Import/Forms.php		diff \| blob \| blame \| history
CRM/Import/Parser.php		diff \| blob \| blame \| history
CRM/Member/Import/Form/Preview.php		diff \| blob \| blame \| history
CRM/Member/Import/Form/Summary.php		diff \| blob \| blame \| history
CRM/Member/Import/Parser/Membership.php		diff \| blob \| blame \| history
templates/CRM/Activity/Import/Form/Preview.tpl		diff \| blob \| blame \| history
templates/CRM/Activity/Import/Form/Summary.tpl		diff \| blob \| blame \| history
templates/CRM/Contact/Import/Form/Preview.tpl		diff \| blob \| blame \| history
templates/CRM/Contact/Import/Form/Summary.tpl		diff \| blob \| blame \| history
templates/CRM/Contribute/Import/Form/Preview.tpl		diff \| blob \| blame \| history
templates/CRM/Contribute/Import/Form/Summary.tpl		diff \| blob \| blame \| history
templates/CRM/Event/Import/Form/Preview.tpl		diff \| blob \| blame \| history
templates/CRM/Event/Import/Form/Summary.tpl		diff \| blob \| blame \| history
templates/CRM/Member/Import/Form/Preview.tpl		diff \| blob \| blame \| history
templates/CRM/Member/Import/Form/Summary.tpl		diff \| blob \| blame \| history

RSS Atom