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

Copyright update #132

Closed
wants to merge 4 commits into from
Closed

Copyright update #132

wants to merge 4 commits into from

Conversation

cadenmyers13
Copy link
Contributor

All files that need copyright updates that were not edited in the flake8 PRs

@cadenmyers13
Copy link
Contributor Author

cadenmyers13 commented Jul 25, 2024

@sbillinge This PR made edits to phaseconstraintspanel.py that were made in one of the flake8 PRs. Will this give a merge conflict when those flake8 PRs eventually get merged? The edits made should be the same I think i just made a mistake when I ran into some merge conflicts locally.

I merged this branch into my scrap branch and it made me manually pick which edits i wanted on the phaseconstraintspanel.py file, but once selected pre-commit ran fine.

@cadenmyers13 cadenmyers13 deleted the copyright2006 branch July 31, 2024 16:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant