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.

Sign up for GitHub

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

Jump to bottom

Minor changes after merge conflicts #734

Merged
merged 5 commits into from
Jul 17, 2023
Merged

Minor changes after merge conflicts #734

merged 5 commits into from
Jul 17, 2023

Conversation

anitacaron
Copy link
Collaborator

Fixes #733

@anitacaron anitacaron self-assigned this Jul 7, 2023
@wdduncan
Copy link
Collaborator

Is this ready to merge?

@anitacaron
Copy link
Collaborator Author

Yes, @wdduncan. I am waiting for the second approval.

@wdduncan
Copy link
Collaborator

@cthoyt Do you have time to review?

@anitacaron anitacaron requested a review from wdduncan July 17, 2023 15:23
wdduncan
wdduncan approved these changes Jul 17, 2023
View reviewed changes
Copy link
Collaborator

@wdduncan wdduncan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A number of the changes are hard to follow due spurious diffs (i.e., a line being deleted and inserted).
I'll have to trust that everything is fine :)

@anitacaron
Copy link
Collaborator Author

Thanks. This is simply reordering the file.

@anitacaron anitacaron merged commit a4b8265 into master Jul 17, 2023
@wdduncan wdduncan deleted the anitacaron/issue733 branch July 18, 2023 16:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matentzn matentzn matentzn approved these changes

@cthoyt cthoyt cthoyt approved these changes

@wdduncan wdduncan wdduncan approved these changes

Assignees

@anitacaron anitacaron

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Issues remaining after #732
4 participants
@anitacaron @wdduncan @cthoyt @matentzn