We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent ef09e62 commit 1afb973Copy full SHA for 1afb973
rabbitmq-components.mk
@@ -40,9 +40,15 @@ endif
40
# all projects use the same versions. It avoids conflicts.
41
42
dep_accept = hex 0.3.5
43
+<<<<<<< HEAD
44
dep_cowboy = hex 2.12.0
45
dep_cowlib = hex 2.13.0
46
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)
52
dep_cuttlefish = hex 3.4.0
53
dep_gen_batch_server = hex 0.8.8
54
dep_jose = hex 1.11.10
0 commit comments