Skip to content

Commit 49b4717

Browse files
Loïc Hoguinmergify-bot
authored andcommitted
Update Ranch to 2.1.0
(cherry picked from commit d327e8a) # Conflicts: # rabbitmq-components.mk
1 parent 612b4f7 commit 49b4717

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

rabbitmq-components.mk

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,13 @@ dep_cowlib = hex 2.9.1
116116
dep_jsx = hex 3.1.0
117117
dep_looking_glass = git https://github.com/rabbitmq/looking_glass master
118118
dep_prometheus = hex 4.8.1
119+
<<<<<<< HEAD
119120
dep_ra = hex 2.0.0
120121
dep_ranch = hex 2.0.0
122+
=======
123+
dep_ra = git https://github.com/rabbitmq/ra.git master
124+
dep_ranch = hex 2.1.0
125+
>>>>>>> d327e8a7cb (Update Ranch to 2.1.0)
121126
dep_recon = hex 2.5.1
122127
dep_observer_cli = hex 1.6.2
123128
dep_stdout_formatter = hex 0.2.4

0 commit comments

Comments
 (0)