Fix conflict

Author: acogoluegnes

deps/rabbit/src/rabbit_channel.erl

@@ -2192,15 +2192,10 @@ deliver_to_queues({Delivery = #delivery{message    = Message = #basic_message{ex
                                         mandatory  = Mandatory,
                                         confirm    = Confirm,
                                         msg_seq_no = MsgSeqNo},
-<<<<<<< HEAD
-                   RoutedToQueueNames = [QName]}, State0 = #ch{queue_states = QueueStates0}) -> %% optimisation when there is one queue
+                                        RoutedToQueueNames = [QName]},
+                                        State0 = #ch{cfg = #conf{extended_return_callback = ExtendedReturnCallback},
+                                                     queue_states = QueueStates0}) -> %% optimisation when there is one queue
     Qs0 = rabbit_amqqueue:lookup(RoutedToQueueNames),
-=======
-                   RoutedToQueueNames = [QName]},
-                   State0 = #ch{cfg = #conf{extended_return_callback = ExtendedReturnCallback},
-                                queue_states = QueueStates0}) -> %% optimisation when there is one queue
-    Qs0 = rabbit_amqqueue:lookup_many(RoutedToQueueNames),
->>>>>>> 4c99c49587 (Settle unroutable message with released state)
     Qs = rabbit_amqqueue:prepend_extra_bcc(Qs0),
     QueueNames = lists:map(fun amqqueue:get_name/1, Qs),
     case rabbit_queue_type:deliver(Qs, Delivery, QueueStates0) of
@@ -2236,15 +2231,10 @@ deliver_to_queues({Delivery = #delivery{message    = Message = #basic_message{ex
                                         mandatory  = Mandatory,
                                         confirm    = Confirm,
                                         msg_seq_no = MsgSeqNo},
-<<<<<<< HEAD
-                   RoutedToQueueNames}, State0 = #ch{queue_states = QueueStates0}) ->
-    Qs0 = rabbit_amqqueue:lookup(RoutedToQueueNames),
-=======
                    RoutedToQueueNames},
                    State0 = #ch{cfg = #conf{extended_return_callback = ExtendedReturnCallback},
                                 queue_states = QueueStates0}) ->
-    Qs0 = rabbit_amqqueue:lookup_many(RoutedToQueueNames),
->>>>>>> 4c99c49587 (Settle unroutable message with released state)
+    Qs0 = rabbit_amqqueue:lookup(RoutedToQueueNames),
     Qs = rabbit_amqqueue:prepend_extra_bcc(Qs0),
     QueueNames = lists:map(fun amqqueue:get_name/1, Qs),
     case rabbit_queue_type:deliver(Qs, Delivery, QueueStates0) of