Resolve conflicts #8646

Author: michaelklishin

deps/rabbit/test/per_vhost_msg_store_SUITE.erl

@@ -186,13 +186,6 @@ folder_size(Dir) ->
     filelib:fold_files(Dir, ".*", true,
                        fun(F,Acc) -> filelib:file_size(F) + Acc end, 0).
 
-<<<<<<< HEAD
-get_global_folder_size(Config) ->
-    BaseDir = rabbit_ct_broker_helpers:rpc(Config, 0, rabbit_mnesia, dir, []),
-    folder_size(BaseDir).
-
-=======
->>>>>>> 7f07a9c230 (Test: verify just vhost folder, not whole directory)
 vhost_dir(Vhost, Config) ->
     rabbit_ct_broker_helpers:rpc(Config, 0,
                                  rabbit_vhost, msg_store_dir_path, [Vhost]).

deps/rabbitmq_recent_history_exchange/test/system_SUITE.erl

@@ -149,23 +149,13 @@ e2e_test(Config) ->
                          routing_key = <<"">>
                         }),
 
-<<<<<<< HEAD
-    #'queue.declare_ok'{message_count = Count, queue = Q} =
-        amqp_channel:call(Chan, #'queue.declare' {
-                                   passive   = true,
-                                   queue     = Q
-                                  }),
-
-    ?assertEqual(MsgCount, Count),
-=======
     %% Wait for all messages to be queued.
     ?awaitMatch(#'queue.declare_ok'{message_count = MsgCount, queue = Q},
                 amqp_channel:call(Chan, #'queue.declare' {
                                            passive   = true,
                                            queue     = Q
                                           }),
                 30000),
->>>>>>> cbd086322a (Test: wait for messages in recent history exchange suite)
 
     amqp_channel:call(Chan, #'exchange.delete' { exchange = make_exchange_name(Config, "1") }),
     amqp_channel:call(Chan, #'exchange.delete' { exchange = make_exchange_name(Config, "2") }),