From 94d1a61d0b6a3d0c019d164675c8c7103d439d53 Mon Sep 17 00:00:00 2001
From: Michael Klishin <michael@clojurewerkz.org>
Date: Fri, 15 Mar 2024 21:44:05 -0400
Subject: [PATCH] Resolve a conflict #10754, #10755

(cherry picked from commit 33680a4095903d2c3c251122efb73f18cdf14e89)
---
 deps/rabbit/src/rabbit_channel.erl | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/deps/rabbit/src/rabbit_channel.erl b/deps/rabbit/src/rabbit_channel.erl
index 8a66d3f3b4c2..88d616ea4558 100644
--- a/deps/rabbit/src/rabbit_channel.erl
+++ b/deps/rabbit/src/rabbit_channel.erl
@@ -109,20 +109,13 @@
           max_message_size,
           consumer_timeout,
           authz_context,
-          max_consumers,  % taken from rabbit.consumer_max_per_channel
+          %% taken from rabbit.consumer_max_per_channel
+          max_consumers,
           %% defines how ofter gc will be executed
-<<<<<<< HEAD
-<<<<<<< HEAD
           writer_gc_threshold,
           %% true with AMQP 1.0 to include the publishing sequence
           %% in the return callback, false otherwise
           extended_return_callback
-=======
-          max_consumers  % taken from rabbit.consumer_max_per_channel
-=======
->>>>>>> 72317cc1b0 (address feedback)
-          writer_gc_threshold
->>>>>>> d7374cb244 (Add consumers per channel limit)
          }).
 
 -record(pending_ack, {
@@ -533,13 +526,9 @@ init([Channel, ReaderPid, WriterPid, ConnPid, ConnName, Protocol, User, VHost,
                             max_message_size = MaxMessageSize,
                             consumer_timeout = ConsumerTimeout,
                             authz_context = OptionalVariables,
-<<<<<<< HEAD
                             writer_gc_threshold = GCThreshold,
-                            extended_return_callback = UseExtendedReturnCallback
-=======
-                            max_consumers = MaxConsumers,
-                            writer_gc_threshold = GCThreshold
->>>>>>> d7374cb244 (Add consumers per channel limit)
+                            extended_return_callback = UseExtendedReturnCallback,
+                            max_consumers = MaxConsumers
                            },
                 limiter = Limiter,
                 tx                      = none,