Resolve a conflict #10476 #10478

michaelklishin · michaelklishin · commit 9e5565b65e02 · 2024-02-02T20:37:42.000-05:00
diff --git a/deps/rabbit/src/rabbit_channel.erl b/deps/rabbit/src/rabbit_channel.erl
@@ -2856,9 +2856,3 @@ maybe_decrease_global_publishers(#ch{publishing_mode = false}) ->
     ok;
 maybe_decrease_global_publishers(#ch{publishing_mode = true}) ->
     rabbit_global_counters:publisher_deleted(amqp091).
-<<<<<<< HEAD
-=======
-
-is_global_qos_permitted() ->
-    rabbit_deprecated_features:is_permitted(global_qos).
->>>>>>> a2ff5a0b7b (Check consumer size for clean strats)
