From c529225482a9a6515ddbbfb693ab3e3496144746 Mon Sep 17 00:00:00 2001 From: Michael Klishin <klishinm@vmware.com> Date: Tue, 12 Nov 2024 11:37:41 -0500 Subject: [PATCH] Resolve a conflict #12704 #12706 #12194 --- rabbitmq-components.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/rabbitmq-components.mk b/rabbitmq-components.mk index 629652d70be3..c89398807794 100644 --- a/rabbitmq-components.mk +++ b/rabbitmq-components.mk @@ -122,10 +122,7 @@ dep_gen_batch_server = hex 0.8.8 dep_jose = hex 1.11.10 dep_khepri = hex 0.16.0 dep_khepri_mnesia_migration = hex 0.7.0 -<<<<<<< HEAD -======= dep_osiris = git https://github.com/rabbitmq/osiris v1.8.4 ->>>>>>> 5f4715979c (Osiris v1.8.4) dep_prometheus = hex 4.11.0 dep_ra = hex 2.14.0 dep_ranch = hex 2.1.0