Skip to content

Commit df95a81

Browse files
Alex Valiushkomergify[bot]
authored andcommitted
bump elixir to 1.17
(cherry picked from commit 70ac0cf) # Conflicts: # deps/rabbitmq_cli/mix.exs (cherry picked from commit ad76b8b) # Conflicts: # deps/rabbitmq_cli/mix.exs
1 parent 44caf8a commit df95a81

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

deps/rabbitmq_cli/mix.exs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,17 @@ defmodule RabbitMQCtl.MixfileBase do
1010
def project do
1111
[
1212
app: :rabbitmqctl,
13+
<<<<<<< HEAD
1314
version: "3.11.19",
15+
=======
16+
<<<<<<< HEAD
17+
version: "3.12.1",
18+
>>>>>>> ad76b8bebb (bump elixir to 1.17)
1419
elixir: ">= 1.13.4 and < 1.16.0",
20+
=======
21+
version: "3.13.0-dev",
22+
elixir: ">= 1.13.4 and < 1.17.0",
23+
>>>>>>> 70ac0cf3c5 (bump elixir to 1.17)
1524
build_embedded: Mix.env() == :prod,
1625
start_permanent: Mix.env() == :prod,
1726
escript: [main_module: RabbitMQCtl, emu_args: "-hidden", path: "escript/rabbitmqctl"],

0 commit comments

Comments
 (0)