Skip to content

Commit 5c04ec7

Browse files
HoloRinmergify-bot
authored andcommitted
Remove extra copies of rabbitmq-components.mk & erlang.mk
(cherry picked from commit 1ad078e) (cherry picked from commit effb0b6) # Conflicts: # deps/rabbitmq_ct_client_helpers/rabbitmq-components.mk # deps/rabbitmq_ct_helpers/rabbitmq-components.mk (cherry picked from commit 9ede081) # Conflicts: # deps/rabbitmq_ct_client_helpers/rabbitmq-components.mk # deps/rabbitmq_ct_helpers/rabbitmq-components.mk
1 parent 367955a commit 5c04ec7

File tree

4 files changed

+4
-16316
lines changed

4 files changed

+4
-16316
lines changed

deps/rabbitmq_ct_client_helpers/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ ERLANG_MK_COMMIT = rabbitmq-tmp
1212
DEP_PLUGINS = rabbit_common/mk/rabbitmq-build.mk \
1313
rabbit_common/mk/rabbitmq-tools.mk
1414

15-
include rabbitmq-components.mk
16-
include erlang.mk
15+
include ../../rabbitmq-components.mk
16+
include ../../erlang.mk

0 commit comments

Comments
 (0)