Resolve a conflict #11488 #11478 #11500

rabbitmq · Jun 19, 2024 · 91b4d0f · 91b4d0f
1 parent 9166522
commit 91b4d0f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 124 deletions.
diff --git a/.github/workflows/perform-bazel-execution-comparison.yaml b/.github/workflows/perform-bazel-execution-comparison.yaml
diff --git a/bazel/bzlmod/secondary_umbrella.bzl b/bazel/bzlmod/secondary_umbrella.bzl
@@ -31,18 +31,6 @@ def secondary_umbrella():
         strip_prefix = "rabbitmq_server-3.11.18",
         # This file is produced just in time by the test-mixed-versions.yaml GitHub Actions workflow.
         urls = [
-<<<<<<< HEAD
-<<<<<<< HEAD
-            "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",
-=======
-<<<<<<< HEAD
-            "https://rabbitmq-github-actions.s3.eu-west-1.amazonaws.com/secondary-umbrellas/rbe-25_3/package-generic-unix-for-mixed-version-testing-v3.12.6.tar.xz",
-=======
-            "https://rabbitmq-github-actions.s3.eu-west-1.amazonaws.com/secondary-umbrellas/26.1/package-generic-unix-for-mixed-version-testing-v3.13.1.tar.xz",
->>>>>>> a2709dfd05 (Remove remaining buildbuddy usage)
->>>>>>> b38dc84db5 (Remove remaining buildbuddy usage)
-=======
-            "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)
+            "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"
         ],
     )