From 373fa78d7fbf10d22cd9f9c829720189e04daf25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mi=C5=A1ko=20Hevery?= <misko@hevery.com>
Date: Tue, 22 May 2018 10:54:37 -0700
Subject: [PATCH] fix: merge collision (#24054)

PR Close #24054
---
 packages/core/test/render3/ivy/BUILD.bazel | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/core/test/render3/ivy/BUILD.bazel b/packages/core/test/render3/ivy/BUILD.bazel
index 0a14e7d6d7..57a2439653 100644
--- 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",