Skip to content

Commit

Permalink
Resolve a conflict #12484 #12494
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelklishin committed Oct 8, 2024
1 parent 85fa174 commit daa7036
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions rabbitmq-components.mk
Original file line number Diff line number Diff line change
Expand Up @@ -126,13 +126,8 @@ dep_prometheus = hex 4.11.0
dep_ra = hex 2.13.5
dep_ranch = hex 2.1.0
dep_recon = hex 2.5.3
<<<<<<< HEAD
dep_redbug = hex 2.0.7
dep_thoas = hex 1.2.1
=======
dep_redbug = hex 2.1.0
dep_thoas = hex 1.0.0
>>>>>>> c348501db2 (Dependency Redbug updated from 2.0.7 to 2.1.0)
dep_thoas = hex 1.2.1
dep_observer_cli = hex 1.7.5
dep_seshat = git https://github.com/rabbitmq/seshat v0.6.1
dep_stdout_formatter = hex 0.2.4
Expand Down

0 comments on commit daa7036

Please sign in to comment.