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

[REF] [Import] Use shared file instead of now-identical files #23216

Merged
merged 1 commit into from
Apr 20, 2022

Conversation

eileenmcnaughton
Copy link
Contributor

@eileenmcnaughton eileenmcnaughton commented Apr 15, 2022

Overview

Use shared file instead of now-identical files

Before

#23186 updated the 2 DataSource.tpl files to be identical - but I left them in place to keep the diff readable

After

The guts of the file is now moved to a shared location

I put up screenshots just to show they actually still load.... & that I did an r-run

image

image

Technical Details

Comments

@colemanw - I didn't do any extra steps here so should be an easy merge

@civibot
Copy link

civibot bot commented Apr 15, 2022

(Standard links)

@civibot civibot bot added the master label Apr 15, 2022
@eileenmcnaughton eileenmcnaughton changed the title Use shared file instead of now-identical files [REF] [Import] Use shared file instead of now-identical files Apr 18, 2022
@eileenmcnaughton
Copy link
Contributor Author

@colemanw @seamuslee001 would be great to get a merge on this - I did literally move the file so it is exactly the same...

@colemanw colemanw merged commit 1440e38 into civicrm:master Apr 20, 2022
@colemanw colemanw deleted the import_more branch April 20, 2022 15:12
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