From f73af610777738e06e25f2ca38acee95809dc14f Mon Sep 17 00:00:00 2001 From: Rin Kuryloski Date: Wed, 19 Jun 2024 13:59:29 +0200 Subject: [PATCH] fixup backport --- deps/rabbit/BUILD.bazel | 4 ---- deps/rabbitmq_amqp1_0/BUILD.bazel | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/deps/rabbit/BUILD.bazel b/deps/rabbit/BUILD.bazel index f79873475b52..ba4cf2fe20f8 100644 --- a/deps/rabbit/BUILD.bazel +++ b/deps/rabbit/BUILD.bazel @@ -249,10 +249,6 @@ plt( ], for_target = ":erlang_app", ignore_warnings = True, -<<<<<<< HEAD -======= - libs = ["@rules_elixir//elixir"], # keep ->>>>>>> 5debebfaf3 (Use rules_elixir to build the cli without mix) plt = "//:base_plt", deps = [ "@looking_glass//:erlang_app", # keep diff --git a/deps/rabbitmq_amqp1_0/BUILD.bazel b/deps/rabbitmq_amqp1_0/BUILD.bazel index 0b7218ab6c20..3c12cba53c31 100644 --- a/deps/rabbitmq_amqp1_0/BUILD.bazel +++ b/deps/rabbitmq_amqp1_0/BUILD.bazel @@ -71,7 +71,7 @@ plt( ], for_target = ":erlang_app", ignore_warnings = True, - libs = ["//deps/rabbitmq_cli:elixir"], # keep + libs = ["@rules_elixir//elixir"], # keep plt = "//:base_plt", deps = ["//deps/rabbitmq_cli:erlang_app"], # keep )