Resolve conflicts (#8771)

michaelklishin · michaelklishin · commit c5ceffaecb72 · 2023-07-05T10:55:27.000+04:00
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -388,8 +388,6 @@ erlang_dev_package = use_extension(
 erlang_dev_package.hex_package(
     name = "amqp",
     build_file = "@rabbitmq-server//bazel:BUILD.amqp",
-    patch_args = ["-p1"],
-    patches = ["@rabbitmq-server//bazel:amqp.patch"],
     sha256 = "b6d926770e4508e30e3e9e476c57b6c8aeda44f7715663bdc38935620ce5be6f",
     version = "2.1.1",
 )

Original file line number	Diff line number	Diff line change
`@@ -388,8 +388,6 @@ erlang_dev_package = use_extension(`
`388`	`388`	`erlang_dev_package.hex_package(`
`389`	`389`	`name = "amqp",`
`390`	`390`	`build_file = "@rabbitmq-server//bazel:BUILD.amqp",`
`391`		`- patch_args = ["-p1"],`
`392`		`- patches = ["@rabbitmq-server//bazel:amqp.patch"],`
`393`	`391`	`sha256 = "b6d926770e4508e30e3e9e476c57b6c8aeda44f7715663bdc38935620ce5be6f",`
`394`	`392`	`version = "2.1.1",`
`395`	`393`	`)`