Resolve a conflict #10476 #10478

rabbitmq · Feb 3, 2024 · 9e5565b · 9e5565b
1 parent 3cec2e0
commit 9e5565b
Showing 1 changed file with 0 additions and 6 deletions.
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)