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

Fixes #24108: Merge conflict error #639

Closed
wants to merge 1 commit into from
Closed

Fixes #24108: Merge conflict error #639

wants to merge 1 commit into from

Conversation

ElaadF
Copy link
Member

@ElaadF ElaadF commented Jan 30, 2024

@ElaadF ElaadF mentioned this pull request Jan 30, 2024
Closed
@ElaadF ElaadF changed the base branch from 8.0-next to branches/rudder/8.0 January 30, 2024 17:08
@ElaadF ElaadF force-pushed the bug_24108/merge_conflict_error branch 2 times, most recently from 3c13b21 to 278c4c0 Compare January 30, 2024 17:48
@ElaadF ElaadF force-pushed the bug_24108/merge_conflict_error branch from 278c4c0 to 66e35a9 Compare January 30, 2024 17:50
@ElaadF ElaadF closed this Jan 30, 2024
@ElaadF ElaadF deleted the bug_24108/merge_conflict_error branch January 30, 2024 17:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@VinceMacBuche VinceMacBuche Awaiting requested review from VinceMacBuche

@RaphaelGauthier RaphaelGauthier Awaiting requested review from RaphaelGauthier

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
1 participant
@ElaadF