fixup backport

MODULE.bazel

@@ -67,66 +67,6 @@ erlang_config = use_extension(
     "erlang_config",
 )
 
-<<<<<<< HEAD
-erlang_config.internal_erlang_from_github_release(
-    name = "24",
-    sha256 = "8444ff9abe23aea268adbb95463561fc222c965052d35d7c950b17be01c3ad82",
-    version = "24.3.4.6",
-    extra_make_opts = ["-j 4"],
-)
-
-erlang_config.internal_erlang_from_github_release(
-    name = "25_0",
-    sha256 = "8fc707f92a124b2aeb0f65dcf9ac8e27b2a305e7bcc4cc1b2fdf770eec0165bf",
-    version = "25.0.4",
-    extra_make_opts = ["-j 4"],
-)
-
-erlang_config.internal_erlang_from_github_release(
-    name = "25_1",
-    sha256 = "1cd2fbe225a412009cda9b1fd9f3fff0293e75e3020daa48abf68721471e91eb",
-    version = "25.1.2.1",
-    extra_make_opts = ["-j 4"],
-)
-
-erlang_config.internal_erlang_from_github_release(
-    name = "25_2",
-    sha256 = "f4d9f11d67ba478a053d72e635a44722a975603fe1284063fdf38276366bc61c",
-    version = "25.2.3",
-    extra_make_opts = ["-j 4"],
-)
-
-erlang_config.internal_erlang_from_github_release(
-    name = "25_3",
-    sha256 = "0a7338415c8eb6ae25664bfd1a10631c293838ef072665223a524831b823a8b7",
-    version = "25.3.2.10",
-    extra_make_opts = ["-j 4"],
-)
-
-erlang_config.internal_erlang_from_github_release(
-    name = "26_1",
-    sha256 = "f1074cf3a54f1f87e66027d5abebab2fa76a0243453fa58bc5f30d0ce0313921",
-    version = "26.1.2",
-    extra_make_opts = ["-j 4"],
-)
-
-erlang_config.internal_erlang_from_github_release(
-    name = "26_2",
-    extra_make_opts = ["-j 4"],
-    sha256 = "de155c4ad9baab2b9e6c96dbd03bf955575a04dd6feee9c08758beb28484c9f6",
-    version = "26.2.5",
-)
-
-erlang_config.internal_erlang_from_http_archive(
-    name = "git_master",
-    strip_prefix = "otp-master",
-    url = "https://github.com/erlang/otp/archive/refs/heads/master.tar.gz",
-    version = "27",
-    extra_make_opts = ["-j 4"],
-)
-
-=======
->>>>>>> a6874e39cc (Turn off BuildBuddy integration (#11343))
 use_repo(
     erlang_config,
     "erlang_config",

WORKSPACE

@@ -34,58 +34,6 @@ load("@rules_erlang//gazelle:deps.bzl", "gazelle_deps")
 
 gazelle_deps()
 
-<<<<<<< HEAD
-http_file(
-    name = "otp_src_24",
-    downloaded_file_path = "OTP-24.3.4.6.tar.gz",
-    sha256 = "dc3d2c54eeb093e0dc9a0fe493bc69d6dfac0affbe77c9e3c935aa86c0f63cd5",
-    urls = ["https://github.com/erlang/otp/archive/OTP-24.3.4.6.tar.gz"],
-)
-
-http_file(
-    name = "otp_src_25_0",
-    downloaded_file_path = "OTP-25.0.4.tar.gz",
-    sha256 = "05878cb51a64b33c86836b12a21903075c300409b609ad5e941ddb0feb8c2120",
-    urls = ["https://github.com/erlang/otp/archive/OTP-25.0.4.tar.gz"],
-)
-
-http_file(
-    name = "otp_src_25_1",
-    downloaded_file_path = "OTP-25.1.2.1.tar.gz",
-    sha256 = "79f8e31bb9ff7d43a920f207ef104d1106b2332fdbadf11241d714eacb6d8d1a",
-    urls = ["https://github.com/erlang/otp/archive/OTP-25.1.2.1.tar.gz"],
-)
-
-http_file(
-    name = "otp_src_25_2",
-    downloaded_file_path = "OTP-25.2.3.tar.gz",
-    sha256 = "637bc5cf68dd229fd3c3fe889a6f84dd32c4a827488550a0a98123b00c2d78b5",
-    urls = ["https://github.com/erlang/otp/archive/OTP-25.2.3.tar.gz"],
-)
-
-http_file(
-    name = "otp_src_25_3",
-    downloaded_file_path = "OTP-25.3.2.10.tar.gz",
-    sha256 = "be76f05bd38c60df056ed35f01085f088474a1942ce1778c2217e5658d435b35",
-    urls = ["https://github.com/erlang/otp/archive/OTP-25.3.2.10.tar.gz"],
-)
-
-http_file(
-    name = "otp_src_26_1",
-    downloaded_file_path = "OTP-26.1.2.tar.gz",
-    sha256 = "56042d53b30863d4e720ebf463d777f0502f8c986957fc3a9e63dae870bbafe0",
-    urls = ["https://github.com/erlang/otp/archive/OTP-26.1.2.tar.gz"],
-)
-
-http_file(
-    name = "otp_src_26_2",
-    downloaded_file_path = "OTP-26.2.5.tar.gz",
-    sha256 = "d34b409cb5968ae47dd5a0c4f85b925d5601898d90788bbb08d514964a3a141d",
-    urls = ["https://github.com/erlang/otp/archive/OTP-26.2.5.tar.gz"],
-)
-
-=======
->>>>>>> a6874e39cc (Turn off BuildBuddy integration (#11343))
 new_git_repository(
     name = "bats",
     build_file = "@//:BUILD.bats",