Conflicts

Author: dmateusp

WORKSPACE.bazel

@@ -4,17 +4,15 @@ 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()
 
 # 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")