Resolve a conflict #14373 #14374

Author: michaelklishin

deps/rabbit/src/rabbit_plugins.erl

@@ -694,23 +694,6 @@ remove_plugins(Plugins) ->
               IsAPlugin =
               lists:member(Plugin, ActualPlugins) orelse
               lists:member(Name, PluginDeps),
-<<<<<<< HEAD
-              if
-                  IsOTPApp ->
-                      rabbit_log:debug(
-                        "Plugins discovery: "
-                        "ignoring ~ts, Erlang/OTP application",
-                        [Name]);
-                  not IsAPlugin ->
-                      rabbit_log:debug(
-                        "Plugins discovery: "
-                        "ignoring ~ts, not a RabbitMQ plugin",
-                        [Name]);
-                  true ->
-                      ok
-              end,
-=======
->>>>>>> 30d78a490 (Do not log every transient dependency when listing plugins)
               not (IsOTPApp orelse not IsAPlugin)
       end, Plugins).