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

Remove duplicate file #22569

Merged
merged 1 commit into from
Jan 19, 2022
Merged

Conversation

demeritcowboy
Copy link
Contributor

Overview

Something weird happened at #22531

It added a whole new file instead of updating the existing one, due to mismatched case in the filename. I don't know which is the right one of GetTargetAndAssignee.ex.php and GetTargetandAssignee.ex.php so I'm just picking one to delete.

https://github.com/civicrm/civicrm-core/tree/cf2f87fbef5139c29a81e126d449d2d084066d55/api/v3/examples/Activity

On windows it thinks I've modified the file locally since it thinks those files are the same file.

@civibot
Copy link

civibot bot commented Jan 18, 2022

(Standard links)

@civibot civibot bot added the master label Jan 18, 2022
@pradpnayak
Copy link
Contributor

GetTargetandAssignee.ex.php should be removed, the other one is created from the test tests//phpunit/api/v3/ActivityTest.php:382

@demeritcowboy
Copy link
Contributor Author

Ok thanks. It's strange that there's another file GetTargetandAssigneeName.ex.php which only has a small "a". But I'll update since I see now it goes by what's in $subfile.

@eileenmcnaughton
Copy link
Contributor

@demeritcowboy please merge this once you are happy with it

@demeritcowboy demeritcowboy merged commit 7fb22a7 into civicrm:master Jan 19, 2022
@demeritcowboy demeritcowboy deleted the duplicate-file branch January 19, 2022 04:00
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.

3 participants