Resolve a conflict #13608 #13607 #13611

Author: michaelklishin

rabbitmq-components.mk

@@ -40,15 +40,9 @@ endif
 # all projects use the same versions. It avoids conflicts.
 
 dep_accept = hex 0.3.5
-<<<<<<< HEAD
 dep_cowboy = hex 2.12.0
 dep_cowlib = hex 2.13.0
-dep_credentials_obfuscation = hex 3.4.0
-=======
-dep_cowboy = hex 2.13.0
-dep_cowlib = hex 2.14.0
 dep_credentials_obfuscation = hex 3.5.0
->>>>>>> 7ec3aa745 (Bump Cuttlefish to 3.5.0)
 dep_cuttlefish = hex 3.4.0
 dep_gen_batch_server = hex 0.8.8
 dep_jose = hex 1.11.10