Resolve a conflict #14097 14099

Author: michaelklishin

deps/rabbitmq_federation/Makefile

@@ -9,14 +9,9 @@ define PROJECT_ENV
 	  ]
 endef
 
-<<<<<<< HEAD
 define PROJECT_APP_EXTRA_KEYS
 	{broker_version_requirements, []}
 endef
-=======
-DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
-DEP_PLUGINS = rabbit_common/mk/rabbitmq-build.mk
->>>>>>> 0801e68c1 (Federation: update makefile to avoid dialyzer compilation errors)
 
 DEPS = rabbit_common rabbit amqp_client
 TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers