Fix conflict

Author: ansd

deps/rabbit/src/rabbit_fifo_dlx_client.erl

@@ -46,17 +46,10 @@ process_command(Cmd, #state{leader = Leader} = State, Tries) ->
     case ra:process_command(Leader, Cmd, 60_000) of
         {ok, ok, Leader} ->
             {ok, State#state{leader = Leader}};
-<<<<<<< HEAD
-        {ok, ok, L} ->
-            rabbit_log:warning("Failed to process command ~p on quorum queue leader ~p because actual leader is ~p.",
-                               [Cmd, Leader, L]),
-            {error, ra_command_failed};
-=======
         {ok, ok, NonLocalLeader} ->
-            rabbit_log:warning("Failed to process command ~tp on quorum queue leader ~tp because actual leader is ~tp.",
+            rabbit_log:warning("Failed to process command ~p on quorum queue leader ~p because actual leader is ~p.",
                                [Cmd, Leader, NonLocalLeader]),
             {error, non_local_leader};
->>>>>>> 416211079e (Do not restart DLX worker if leader is non-local)
         Err ->
             rabbit_log:warning("Failed to process command ~p on quorum queue leader ~p: ~p~n"
                                "Trying ~b more time(s)...",