Skip to content

Commit

Permalink
Resolve a conflict #11488 #11478 #11500
Browse files Browse the repository at this point in the history
(cherry picked from commit 91b4d0f)

# Conflicts:
#	.github/workflows/perform-bazel-execution-comparison.yaml
#	bazel/bzlmod/secondary_umbrella.bzl
  • Loading branch information
michaelklishin authored and mergify[bot] committed Jun 20, 2024
1 parent 4057f2a commit 5f19ead
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions bazel/bzlmod/secondary_umbrella.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ def secondary_umbrella():
strip_prefix = "rabbitmq_server-3.10.24",
urls = [
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"https://rabbitmq-github-actions.s3.eu-west-1.amazonaws.com/secondary-umbrellas/rbe-25/package-generic-unix-for-mixed-version-testing-v3.10.24.tar.xz",
=======
Expand All @@ -52,5 +53,8 @@ def secondary_umbrella():
"https://rabbitmq-github-actions.s3.eu-west-1.amazonaws.com/secondary-umbrellas/25.3/package-generic-unix-for-mixed-version-testing-v3.12.6.tar.xz",
>>>>>>> f28089177a (fixup backport)
>>>>>>> 91665228cc (fixup backport)
=======
"https://rabbitmq-github-actions.s3.eu-west-1.amazonaws.com/secondary-umbrellas/rbe-25_0/package-generic-unix-for-mixed-version-testing-v3.11.18.tar.xz"
>>>>>>> 91b4d0f5b1 (Resolve a conflict #11488 #11478 #11500)
],
)

0 comments on commit 5f19ead

Please sign in to comment.