Skip to content

Commit 1afb973

Browse files
michaelklishinmergify[bot]
authored andcommitted
Bump Cuttlefish to 3.5.0
(cherry picked from commit 265e273) (cherry picked from commit 7ec3aa7) # Conflicts: # rabbitmq-components.mk
1 parent ef09e62 commit 1afb973

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

rabbitmq-components.mk

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,15 @@ endif
4040
# all projects use the same versions. It avoids conflicts.
4141

4242
dep_accept = hex 0.3.5
43+
<<<<<<< HEAD
4344
dep_cowboy = hex 2.12.0
4445
dep_cowlib = hex 2.13.0
4546
dep_credentials_obfuscation = hex 3.4.0
47+
=======
48+
dep_cowboy = hex 2.13.0
49+
dep_cowlib = hex 2.14.0
50+
dep_credentials_obfuscation = hex 3.5.0
51+
>>>>>>> 7ec3aa745 (Bump Cuttlefish to 3.5.0)
4652
dep_cuttlefish = hex 3.4.0
4753
dep_gen_batch_server = hex 0.8.8
4854
dep_jose = hex 1.11.10

0 commit comments

Comments
 (0)