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

fix merge conflict #2871

Merged
merged 1 commit into from
May 30, 2024
Merged

fix merge conflict #2871

merged 1 commit into from
May 30, 2024

Conversation

jennyf19
Copy link
Collaborator

No description provided.

@jennyf19 jennyf19 requested a review from a team as a code owner May 30, 2024 00:34
@jennyf19 jennyf19 requested review from JoshLozensky and a team May 30, 2024 00:36
jmprieur
jmprieur approved these changes May 30, 2024
View reviewed changes
Copy link
Collaborator

@jmprieur jmprieur left a comment

Choose a reason for hiding this comment

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

LGTM
Thanks @jennyf19

@jmprieur jmprieur merged commit 3e682e9 into master May 30, 2024
5 checks passed
@jmprieur jmprieur deleted the jennyf/fixMergeConflict branch May 30, 2024 18:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jmprieur jmprieur jmprieur approved these changes

@JoshLozensky JoshLozensky Awaiting requested review from JoshLozensky

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jennyf19 @jmprieur @JoshLozensky