Merge branch 'v3.11.x' into mergify/bp/v3.11.x/pr-9099

Author: michaelklishin

MODULE.bazel

@@ -178,16 +178,8 @@ erlang_package.hex_package(
 erlang_package.hex_package(
     name = "cowboy",
     build_file = "@rabbitmq-server//bazel:BUILD.cowboy",
-<<<<<<< HEAD
     sha256 = "4643e4fba74ac96d4d152c75803de6fad0b3fa5df354c71afdd6cbeeb15fac8a",
     version = "2.8.0",
-=======
-    patch_cmds = [
-        "rm ebin/cowboy.app",
-    ],
-    sha256 = "3afdccb7183cc6f143cb14d3cf51fa00e53db9ec80cdcd525482f5e99bc41d6b",
-    version = "2.10.0",
->>>>>>> b8d32a24bf (Adopt elixir 1.14.5)
 )
 
 erlang_package.hex_package(