Skip to content

Commit b947877

Browse files
Resolve a conflict
1 parent 87e02d7 commit b947877

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/add_vhost_command.ex

-4
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@
55
## Copyright (c) 2007-2023 VMware, Inc. or its affiliates. All rights reserved.
66

77
defmodule RabbitMQ.CLI.Ctl.Commands.AddVhostCommand do
8-
<<<<<<< HEAD
98
alias RabbitMQ.CLI.Core.{DocGuide, Helpers}
10-
=======
11-
alias RabbitMQ.CLI.Core.{DocGuide, ExitCodes, Helpers}
12-
>>>>>>> 9cec4a5907 (Move rabbit_password to rabbit_common)
139

1410
@behaviour RabbitMQ.CLI.CommandBehaviour
1511

0 commit comments

Comments
 (0)