Skip to content

avoid upstream pull conflict#2387

Merged
tshepang merged 1 commit intomasterfrom
tshepang-avoid-conflict
May 15, 2025
Merged

avoid upstream pull conflict#2387
tshepang merged 1 commit intomasterfrom
tshepang-avoid-conflict

Conversation

@tshepang
Copy link
Copy Markdown
Member

No description provided.

We changed this line and have not pushed it upstream yet,
and upstream changed it in the meanwhile.
@tshepang tshepang merged commit 1ddf2df into master May 15, 2025
1 check passed
@tshepang tshepang deleted the tshepang-avoid-conflict branch May 15, 2025 09:41
Copy link
Copy Markdown
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

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

Thanks

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.

2 participants