root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Resolve a conflict (#9476) 

(cherry picked from commit 7992b20657)
This commit is contained in:
Michael Klishin 2023-09-19 18:44:06 -04:00 committed by Mergify
parent 1ebb8a203f
commit 05ed607d28
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
BUILD.bazel
View File

@ -178,12 +178,7 @@ rabbitmq_run_command(
subcommand = "stop-node", subcommand = "stop-node",
) )
<<<<<<< HEAD
# Allow us to `bazel run start-cluster`
=======
# Allows us to `bazel run start-cluster` # Allows us to `bazel run start-cluster`
>>>>>>> 439bc35916 (BUILD.bazel: fix a few typos)
# for the equivalent of `make start-cluster` # for the equivalent of `make start-cluster`
rabbitmq_run_command( rabbitmq_run_command(
name = "start-cluster", name = "start-cluster",