Resolve a conflict (#9476)

(cherry picked from commit 7992b20657)
2023-09-19 18:44:06 -04:00 · 2023-09-19 18:44:06 -04:00 · 05ed607d28
parent 1ebb8a203f
commit 05ed607d28
1 changed files with 0 additions and 5 deletions
--- a/BUILD.bazel
+++ b/BUILD.bazel
@ -178,12 +178,7 @@ rabbitmq_run_command(
    subcommand = "stop-node",
 )

-<<<<<<< HEAD
-# Allow 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`
 rabbitmq_run_command(
    name = "start-cluster",