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")