Resolve conflicts #14415 #14420

Author: michaelklishin

deps/rabbitmq_shovel/src/rabbit_shovel_parameters.erl

@@ -233,23 +233,12 @@ validate_delete_after(Name,  Term) ->
     {error, "~ts should be a number greater than or equal to 0, \"never\" or \"queue-length\", actually was "
      "~tp", [Name, Term]}.
 
-<<<<<<< HEAD
-=======
 validate_amqp10_delete_after(_Name, <<"never">>)          -> ok;
 validate_amqp10_delete_after(_Name, N) when is_integer(N), N >= 0 -> ok;
 validate_amqp10_delete_after(Name,  Term) ->
     {error, "~ts should be a number greater than or equal to 0 or \"never\", actually was "
      "~tp", [Name, Term]}.
 
-validate_internal_owner(Name, Term0) ->
-    Term = rabbit_data_coercion:to_proplist(Term0),
-
-    rabbit_parameter_validation:proplist(Name, [{<<"name">>, fun rabbit_parameter_validation:binary/2},
-                                                {<<"kind">>, rabbit_parameter_validation:enum(
-                                                              ['exchange', 'queue'])},
-                                                {<<"virtual_host">>, fun rabbit_parameter_validation:binary/2}], Term).
-
->>>>>>> b6d831b11 (Shovel amqp1.0: fix delete after validation)
 validate_queue_args(Name, Term0) ->
     Term = rabbit_data_coercion:to_proplist(Term0),
 

deps/rabbitmq_shovel/test/amqp10_dynamic_SUITE.erl

@@ -28,13 +28,8 @@ groups() ->
           autodelete_amqp091_dest_on_publish,
           simple_amqp10_dest,
           simple_amqp10_src,
-<<<<<<< HEAD
-          amqp091_to_amqp10_with_dead_lettering
-=======
           amqp091_to_amqp10_with_dead_lettering,
-          amqp10_to_amqp091_application_properties,
           test_amqp10_delete_after_queue_length
->>>>>>> b6d831b11 (Shovel amqp1.0: fix delete after validation)
         ]},
       {with_map_config, [], [
           simple,