fixup backport

Author: HoloRin

WORKSPACE

@@ -112,95 +112,6 @@ http_file(
     urls = ["https://github.com/erlang/otp/archive/OTP-26.0.2.tar.gz"],
 )
 
-<<<<<<< HEAD
-load(
-    "@rules_erlang//:rules_erlang.bzl",
-    "erlang_config",
-    "internal_erlang_from_github_release",
-    "internal_erlang_from_http_archive",
-)
-
-erlang_config(
-    internal_erlang_configs = [
-        internal_erlang_from_github_release(
-            name = "24",
-            sha256 = "8444ff9abe23aea268adbb95463561fc222c965052d35d7c950b17be01c3ad82",
-            version = "24.3.4.6",
-        ),
-        internal_erlang_from_github_release(
-            name = "25_0",
-            sha256 = "8fc707f92a124b2aeb0f65dcf9ac8e27b2a305e7bcc4cc1b2fdf770eec0165bf",
-            version = "25.0.4",
-        ),
-        internal_erlang_from_github_release(
-            name = "25_1",
-            sha256 = "1cd2fbe225a412009cda9b1fd9f3fff0293e75e3020daa48abf68721471e91eb",
-            version = "25.1.2.1",
-        ),
-        internal_erlang_from_github_release(
-            name = "25_2",
-            sha256 = "f4d9f11d67ba478a053d72e635a44722a975603fe1284063fdf38276366bc61c",
-            version = "25.2.3",
-        ),
-        internal_erlang_from_github_release(
-            name = "25_3",
-            sha256 = "1f899b4b1ef8569c08713b76bc54607a09503a1d188e6d61512036188cc356db",
-            version = "25.3.2.5",
-        ),
-        internal_erlang_from_github_release(
-            name = "26",
-            sha256 = "4def5ed5e49815fb02fceae8a66e94abc1049f5de30f97d9ad12fdf3293a2470",
-            version = "26.0.2",
-        ),
-        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 = "master",
-        ),
-    ],
-)
-
-load("@erlang_config//:defaults.bzl", "register_defaults")
-
-register_defaults()
-
-load(
-    "//bazel/elixir:elixir.bzl",
-    "elixir_config",
-    "internal_elixir_from_github_release",
-)
-
-elixir_config(
-    internal_elixir_configs = [
-        internal_elixir_from_github_release(
-            name = "1_13",
-            sha256 = "95daf2dd3052e6ca7d4d849457eaaba09de52d65ca38d6933c65bc1cdf6b8579",
-            version = "1.13.4",
-        ),
-        internal_elixir_from_github_release(
-            name = "1_14",
-            sha256 = "2ea249566c67e57f8365ecdcd0efd9b6c375f57609b3ac2de326488ac37c8ebd",
-            version = "1.14.5",
-        ),
-        internal_elixir_from_github_release(
-            name = "1_15",
-            sha256 = "3cfadca57c3092ccbd3ec3f17e5eab529bbd2946f50e4941a903c55c39e3c5f5",
-            version = "1.15.2",
-        ),
-    ],
-    rabbitmq_server_workspace = "@",
-)
-
-load(
-    "@elixir_config//:defaults.bzl",
-    register_elixir_defaults = "register_defaults",
-)
-
-register_elixir_defaults()
-
-=======
->>>>>>> b52722dc1e (Remove the secondary otp and elixir definitions in WORKSPACE file)
 new_git_repository(
     name = "bats",
     build_file = "@//:BUILD.bats",