Resolve a conflict #10458 #10460

Author: michaelklishin

deps/rabbitmq_cli/mix.exs

@@ -10,13 +10,8 @@ defmodule RabbitMQCtl.MixfileBase do
   def project do
     [
       app: :rabbitmqctl,
-<<<<<<< HEAD
-      version: "3.12.1",
-      elixir: ">= 1.13.4 and < 1.16.0",
-=======
-      version: "3.13.0-dev",
+      version: "3.12.13",
       elixir: ">= 1.13.4 and < 1.17.0",
->>>>>>> 70ac0cf3c5 (bump elixir to 1.17)
       build_embedded: Mix.env() == :prod,
       start_permanent: Mix.env() == :prod,
       escript: [