Secondary umbrella: resolve a conflict

(cherry picked from commit 76e0da1) # Conflicts: # bazel/bzlmod/secondary_umbrella.bzl
rabbitmq · Jun 20, 2024 · c4186ce · c4186ce
1 parent 5f19ead
commit c4186ce
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/bazel/bzlmod/secondary_umbrella.bzl b/bazel/bzlmod/secondary_umbrella.bzl
@@ -32,6 +32,7 @@ def secondary_umbrella():
         urls = [
 <<<<<<< HEAD
 <<<<<<< 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",
 =======
@@ -56,5 +57,8 @@ def secondary_umbrella():
 =======
             "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)
+=======
+            "https://rabbitmq-github-actions.s3.eu-west-1.amazonaws.com/secondary-umbrellas/25.0/package-generic-unix-for-mixed-version-testing-v3.11.18.tar.xz",
+>>>>>>> 76e0da11d7 (Secondary umbrella: resolve a conflict)
         ],
     )