Additional conflict resolution

Author: HoloRin

MODULE.bazel

@@ -31,11 +31,7 @@ bazel_dep(
 
 bazel_dep(
     name = "rules_erlang",
-<<<<<<< HEAD
-    version = "3.9.2",
-=======
     version = "3.9.5",
->>>>>>> 733aad5589 (Regenerate bazel/BUILD.eetcd with the latest rules_erlang)
 )
 
 erlang_config = use_extension(

WORKSPACE

@@ -4,11 +4,7 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository", "new_git_r
 git_repository(
     name = "rules_erlang",
     remote = "https://github.com/rabbitmq/rules_erlang.git",
-<<<<<<< HEAD
-    tag = "3.9.2",
-=======
     tag = "3.9.5",
->>>>>>> 733aad5589 (Regenerate bazel/BUILD.eetcd with the latest rules_erlang)
 )
 
 load("@rules_erlang//:internal_deps.bzl", "rules_erlang_internal_deps")

deps/rabbit/BUILD.bazel

@@ -1095,57 +1095,6 @@ rabbitmq_integration_suite(
     size = "small",
 )
 
-<<<<<<< HEAD
-=======
-rabbitmq_integration_suite(
-    name = "exchanges_SUITE",
-    size = "small",
-    additional_beam = [
-        ":quorum_queue_utils",
-    ],
-)
-
-rabbitmq_integration_suite(
-    name = "bindings_SUITE",
-    size = "medium",
-)
-
-rabbitmq_integration_suite(
-    name = "rabbit_db_queue_SUITE",
-    size = "small",
-)
-
-rabbitmq_integration_suite(
-    name = "rabbit_db_maintenance_SUITE",
-    size = "small",
-)
-
-rabbitmq_integration_suite(
-    name = "rabbit_db_topic_exchange_SUITE",
-    size = "small",
-)
-
-rabbitmq_integration_suite(
-    name = "rabbit_db_exchange_SUITE",
-    size = "small",
-)
-
-rabbitmq_integration_suite(
-    name = "rabbit_db_binding_SUITE",
-    size = "small",
-)
-
-rabbitmq_integration_suite(
-    name = "rabbit_db_msup_SUITE",
-    size = "small",
-)
-
-rabbitmq_integration_suite(
-    name = "rabbit_db_policy_SUITE",
-    size = "small",
-)
-
->>>>>>> d56f004324 (Adjust the size of //deps/rabbit:bindings_SUITE to medium)
 assert_suites()
 
 filegroup(