Skip to content

Commit d788e88

Browse files
Merge pull request #9105 from rabbitmq/mergify/bp/v3.11.x/pr-9099
Adopt elixir 1.14.5 (backport #9092) (backport #9099)
2 parents 9a45dc2 + 67d56f7 commit d788e88

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

MODULE.bazel

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -178,16 +178,8 @@ erlang_package.hex_package(
178178
erlang_package.hex_package(
179179
name = "cowboy",
180180
build_file = "@rabbitmq-server//bazel:BUILD.cowboy",
181-
<<<<<<< HEAD
182181
sha256 = "4643e4fba74ac96d4d152c75803de6fad0b3fa5df354c71afdd6cbeeb15fac8a",
183182
version = "2.8.0",
184-
=======
185-
patch_cmds = [
186-
"rm ebin/cowboy.app",
187-
],
188-
sha256 = "3afdccb7183cc6f143cb14d3cf51fa00e53db9ec80cdcd525482f5e99bc41d6b",
189-
version = "2.10.0",
190-
>>>>>>> acd886d0a4 (Adopt otp 25.3.2.5)
191183
)
192184

193185
erlang_package.hex_package(

0 commit comments

Comments
 (0)