Resolve a conflict #10185 #10187

(cherry picked from commit 685c4f6) # Conflicts: #	deps/rabbitmq_management/src/rabbit_mgmt_wm_queue.erl

Author: michaelklishin

deps/rabbitmq_management/src/rabbit_mgmt_wm_queue.erl

@@ -76,6 +76,7 @@ delete_resource(ReqData, Context) ->
  %% while the record uses '_'
  IfUnused = <<"true">> =:= rabbit_mgmt_util:qs_val(<<"if-unused">>, ReqData),
  IfEmpty = <<"true">> =:= rabbit_mgmt_util:qs_val(<<"if-empty">>, ReqData),
+<<<<<<< HEAD
 <<<<<<< HEAD
  VHost = rabbit_mgmt_util:id(vhost, ReqData),
 =======
@@ -102,14 +103,15 @@ delete_resource(ReqData, Context) ->
  {true, ReqData, Context}
  end.
 =======
+=======
+>>>>>>> 685c4f6027 (Resolve a conflict #10185 #10187)
  Name = rabbit_mgmt_util:id(queue, ReqData),
  rabbit_mgmt_util:direct_request(
  'queue.delete',
  fun rabbit_mgmt_format:format_accept_content/1,
  [{queue, Name},
  {if_unused, IfUnused},
  {if_empty, IfEmpty}], "Delete queue error: ~ts", ReqData, Context).
->>>>>>> 7ebaae7ef0 (Revert "HTTP API: DELETE /api/queues/{vhost}/{name} use internal API call")
 
 is_authorized(ReqData, Context) ->
  rabbit_mgmt_util:is_authorized_vhost(ReqData, Context).