iSharkFly-Docs/angular-docs-cn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: merge collision (#24054)

Browse Source 
PR Close #24054
This commit is contained in:
Miško Hevery 2018-05-22 10:54:37 -07:00 committed by Matias Niemelä
parent 26fbf1d13c
commit 373fa78d7f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/core/test/render3/ivy/BUILD.bazel
View File

@ -1,6 +1,6 @@
package(default_visibility = ["//visibility:public"]) 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") load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
ts_library( ts_library(
@ -33,7 +33,7 @@ jasmine_node_test(
], ],
) )
ts_web_test( ts_web_test_suite(
name = "ivy_web", name = "ivy_web",
deps = [ deps = [
":ivy_lib", ":ivy_lib",