From bceb6f560cd5cde58b3ea3e0d688e29cce8b0b49 Mon Sep 17 00:00:00 2001 From: Daniel Pires Date: Mon, 1 May 2023 17:15:21 +0100 Subject: [PATCH] Conflicts --- WORKSPACE.bazel | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel index b0fa68e..a78a183 100644 --- a/WORKSPACE.bazel +++ b/WORKSPACE.bazel @@ -4,7 +4,6 @@ workspace(name = "com_github_cloneable_rules_ent") # ent_go_repositories() -<<<<<<< HEAD # load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies") # go_rules_dependencies() @@ -12,9 +11,8 @@ workspace(name = "com_github_cloneable_rules_ent") # go_register_toolchains(version = "host") # load("@com_github_cloneable_rules_ent//:deps.bzl", "ent_go_dependencies") -======= + # gazelle:repository_macro deps.bzl%ent_go_dependencies ->>>>>>> 281959a (Add example that reproduces proto issue) load("//:workspace.bzl", "install_workspace_dependencies")