Skip to content

Commit 47c68df

Browse files
web-flowmergify[bot]
authored andcommitted
Adopt otp 25.1.2.1
(cherry picked from commit c94884b) (cherry picked from commit c06ddf9) # Conflicts: # MODULE.bazel (cherry picked from commit 13f9201)
1 parent f294f9c commit 47c68df

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

MODULE.bazel

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,11 @@ erlang_dev_package = use_extension(
387387
erlang_dev_package.hex_package(
388388
name = "amqp",
389389
build_file = "@rabbitmq-server//bazel:BUILD.amqp",
390+
<<<<<<< HEAD
391+
=======
392+
patch_args = ["-p1"],
393+
patches = ["@rabbitmq-server//bazel:amqp.patch"],
394+
>>>>>>> c06ddf9fb8 (Adopt otp 25.1.2.1)
390395
sha256 = "b6d926770e4508e30e3e9e476c57b6c8aeda44f7715663bdc38935620ce5be6f",
391396
version = "2.1.1",
392397
)

0 commit comments

Comments
 (0)