Skip to content

Commit 0c25913

Browse files
dcorbachomergify[bot]
authored andcommitted
Federation: update makefile to avoid dialyzer compilation errors
They just happen with a combination of OTP 27.3 and Elixir 1.17 (cherry picked from commit 0801e68) # Conflicts: # deps/rabbitmq_federation/Makefile
1 parent d9c0c6e commit 0c25913

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

deps/rabbitmq_federation/Makefile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,14 @@ define PROJECT_ENV
99
]
1010
endef
1111

12+
<<<<<<< HEAD
1213
define PROJECT_APP_EXTRA_KEYS
1314
{broker_version_requirements, []}
1415
endef
16+
=======
17+
DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
18+
DEP_PLUGINS = rabbit_common/mk/rabbitmq-build.mk
19+
>>>>>>> 0801e68c1 (Federation: update makefile to avoid dialyzer compilation errors)
1520

1621
DEPS = rabbit_common rabbit amqp_client
1722
TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers

0 commit comments

Comments
 (0)