fixup backport

(cherry picked from commit f73af61)
rabbitmq · Jun 20, 2024 · 6a456cc · 6a456cc
1 parent 3796fbb
commit 6a456cc
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/deps/rabbit/BUILD.bazel b/deps/rabbit/BUILD.bazel
@@ -241,10 +241,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
@@ -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
 )