Resolve a conflict #12566

Author: michaelklishin

rabbitmq-components.mk

@@ -126,16 +126,9 @@ dep_prometheus = hex 4.11.0
 dep_ra = hex 2.14.0
 dep_ranch = hex 2.1.0
 dep_recon = hex 2.5.6
-<<<<<<< HEAD
 dep_redbug = hex 2.1.0
 dep_thoas = hex 1.2.1
-dep_observer_cli = hex 1.7.5
-=======
-dep_redbug = hex 2.0.7
-dep_systemd = hex 0.6.1
-dep_thoas = hex 1.0.0
 dep_observer_cli = hex 1.8.0
->>>>>>> 8f7232b742 (Bump observer_cli to 1.8.0)
 dep_seshat = git https://github.com/rabbitmq/seshat v0.6.1
 dep_stdout_formatter = hex 0.2.4
 dep_sysmon_handler = hex 1.3.0