Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Import] Add some not-yet-used getParser functions that are prone to conflict #23590

Merged
merged 1 commit into from
May 26, 2022

Conversation

eileenmcnaughton
Copy link
Contributor

@eileenmcnaughton eileenmcnaughton commented May 26, 2022

Overview

[Import] Add some not-yet-used functions that are prone to conflict

Before

Conflicts keep happening on these functions when I add them in 'thematic' PRs

After

The functions are there....

Technical Details

None of these are used yet

Note that there are not other functions to be shared between the Entity-specific classes - eg. Contribution_MapField Contribution_Preview Contribution_DataSource - so repeating this small function makes more sense than a trait

Comments

@civibot
Copy link

civibot bot commented May 26, 2022

(Standard links)

@civibot civibot bot added the master label May 26, 2022
@eileenmcnaughton eileenmcnaughton force-pushed the import_member_labels branch 3 times, most recently from e3acf36 to eb3ccff Compare May 26, 2022 06:00
@eileenmcnaughton eileenmcnaughton force-pushed the import_member_labels branch 3 times, most recently from f9964bf to 0012914 Compare May 26, 2022 07:09
@eileenmcnaughton eileenmcnaughton changed the title [Import] Add some not-yet-used functions that are prone to conflict [Import] Add some not-yet-used getParser functions that are prone to conflict May 26, 2022
@colemanw colemanw merged commit 3150b83 into civicrm:master May 26, 2022
@eileenmcnaughton eileenmcnaughton deleted the import_member_labels branch May 26, 2022 14:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants