Fix conflict

acogoluegnes · acogoluegnes · commit c788eb03e579 · 2025-01-21T15:00:35.000+01:00
diff --git a/deps/rabbitmq_stream/test/rabbit_stream_SUITE.erl b/deps/rabbitmq_stream/test/rabbit_stream_SUITE.erl
@@ -11,11 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is Pivotal Software, Inc.
-<<<<<<< HEAD
-%% Copyright (c) 2007-2025 Broadcom. All Rights Reserved.
-=======
 %% Copyright (c) 2020-2025 Broadcom. All Rights Reserved.
->>>>>>> 31a4d611f (Emit events on stream consume and cancel)
 %% The term “Broadcom” refers to Broadcom Inc. and/or its subsidiaries. All rights reserved.
 %%
 
diff --git a/deps/rabbitmq_stream/test/rabbit_stream_reader_SUITE.erl b/deps/rabbitmq_stream/test/rabbit_stream_reader_SUITE.erl
@@ -9,11 +9,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is Pivotal Software, Inc.
-<<<<<<< HEAD
-%% Copyright (c) 2007-2025 Broadcom. All Rights Reserved.
-=======
 %% Copyright (c) 2024-2025 Broadcom. All Rights Reserved.
->>>>>>> 31a4d611f (Emit events on stream consume and cancel)
 %% The term “Broadcom” refers to Broadcom Inc. and/or its subsidiaries. All rights reserved.
 %%
 
