Skip to content

Commit d3e2489

Browse files
HoloRinmergify[bot]
authored andcommitted
Remove the secondary otp and elixir definitions in WORKSPACE file
They duplicate the definitions from MODULE.bazel, and are no longer necessary now that we always use bzlmod (cherry picked from commit 8c18c68) (cherry picked from commit b52722d) # Conflicts: # WORKSPACE
1 parent 7bb3773 commit d3e2489

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

WORKSPACE

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ http_file(
112112
urls = ["https://github.com/erlang/otp/archive/OTP-26.0.2.tar.gz"],
113113
)
114114

115+
<<<<<<< HEAD
115116
load(
116117
"@rules_erlang//:rules_erlang.bzl",
117118
"erlang_config",
@@ -198,6 +199,8 @@ load(
198199

199200
register_elixir_defaults()
200201

202+
=======
203+
>>>>>>> b52722dc1e (Remove the secondary otp and elixir definitions in WORKSPACE file)
201204
new_git_repository(
202205
name = "bats",
203206
build_file = "@//:BUILD.bats",

0 commit comments

Comments
 (0)