Resolve a conflict

rabbitmq · Aug 24, 2022 · e443354 · e443354
1 parent 0b400d1
commit e443354
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/rabbitmq-components.mk b/rabbitmq-components.mk
@@ -115,13 +115,8 @@ dep_cowboy = hex 2.8.0
 dep_cowlib = hex 2.9.1
 dep_jsx = hex 3.1.0
 dep_looking_glass = git https://github.com/rabbitmq/looking_glass master
-<<<<<<< HEAD
-dep_prometheus = hex 4.9.0
-dep_ra = hex 2.2.0
-=======
 dep_prometheus = hex 4.9.1
-dep_ra = git https://github.com/rabbitmq/ra.git main
->>>>>>> 1429d3afcd (Update prometheus to 4.9.1)
+dep_ra = hex 2.2.0
 dep_ranch = hex 2.1.0
 dep_recon = hex 2.5.2
 dep_redbug = hex 2.0.7