fix: merge collision (#24054)

PR Close #24054
2018-05-22 10:54:37 -07:00 · 2018-05-22 10:54:37 -07:00 · 373fa78d7f
parent 26fbf1d13c
commit 373fa78d7f
1 changed files with 2 additions and 2 deletions
--- a/packages/core/test/render3/ivy/BUILD.bazel
+++ b/packages/core/test/render3/ivy/BUILD.bazel
@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])

-load("//tools:defaults.bzl", "ts_library", "ts_web_test")
+load("//tools:defaults.bzl", "ts_library", "ts_web_test_suite")
 load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")

 ts_library(
@ -33,7 +33,7 @@ jasmine_node_test(
    ],
 )

-ts_web_test(
+ts_web_test_suite(
    name = "ivy_web",
    deps = [
        ":ivy_lib",