From 966404f18f24dac8ab6aba9f299c1a4d0977beaa Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@google.com>
Date: Wed, 10 Jan 2018 12:48:01 -0800
Subject: [PATCH] build(bazel): fix merge conflict between c4f02e2 and ef956a2

---
 modules/benchmarks/src/BUILD.bazel                       | 3 +--
 modules/benchmarks/src/largetable/BUILD.bazel            | 3 +--
 modules/benchmarks/src/largetable/render3/BUILD.bazel    | 4 +---
 modules/benchmarks/src/tree/BUILD.bazel                  | 3 +--
 modules/benchmarks/src/tree/render3/BUILD.bazel          | 4 +---
 modules/benchmarks/src/tree/render3_function/BUILD.bazel | 4 +---
 6 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/modules/benchmarks/src/BUILD.bazel b/modules/benchmarks/src/BUILD.bazel
index 6aa8288cab2d8..5391f3c59d09d 100644
--- a/modules/benchmarks/src/BUILD.bazel
+++ b/modules/benchmarks/src/BUILD.bazel
@@ -1,13 +1,12 @@
 package(default_visibility = ["//visibility:public"])
 
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("//tools:defaults.bzl", "ts_library")
 
 ts_library(
     name = "util_lib",
     srcs = [
         "util.ts",
     ],
-    tsconfig = "//packages:tsconfig",
     deps = [
         "//packages:types",
         "//packages/core",
diff --git a/modules/benchmarks/src/largetable/BUILD.bazel b/modules/benchmarks/src/largetable/BUILD.bazel
index 8d8ba0afff610..77f2cb24bdce2 100644
--- a/modules/benchmarks/src/largetable/BUILD.bazel
+++ b/modules/benchmarks/src/largetable/BUILD.bazel
@@ -1,13 +1,12 @@
 package(default_visibility = ["//visibility:public"])
 
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("//tools:defaults.bzl", "ts_library")
 
 ts_library(
     name = "util_lib",
     srcs = [
         "util.ts",
     ],
-    tsconfig = "//packages:tsconfig",
     deps = [
         "//modules/benchmarks/src:util_lib",
         "//packages:types",
diff --git a/modules/benchmarks/src/largetable/render3/BUILD.bazel b/modules/benchmarks/src/largetable/render3/BUILD.bazel
index 5e80379875312..959c5afe35f6d 100644
--- a/modules/benchmarks/src/largetable/render3/BUILD.bazel
+++ b/modules/benchmarks/src/largetable/render3/BUILD.bazel
@@ -1,7 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("@angular//:index.bzl", "ng_module")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("//tools:defaults.bzl", "ng_module")
 
 ng_module(
     name = "largetable_lib",
@@ -10,7 +9,6 @@ ng_module(
             "**/*.ts",
         ],
     ),
-    tsconfig = "//packages:tsconfig",
     deps = [
         "//modules/benchmarks/src/largetable:util_lib",
         "//packages:types",
diff --git a/modules/benchmarks/src/tree/BUILD.bazel b/modules/benchmarks/src/tree/BUILD.bazel
index 8d8ba0afff610..77f2cb24bdce2 100644
--- a/modules/benchmarks/src/tree/BUILD.bazel
+++ b/modules/benchmarks/src/tree/BUILD.bazel
@@ -1,13 +1,12 @@
 package(default_visibility = ["//visibility:public"])
 
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("//tools:defaults.bzl", "ts_library")
 
 ts_library(
     name = "util_lib",
     srcs = [
         "util.ts",
     ],
-    tsconfig = "//packages:tsconfig",
     deps = [
         "//modules/benchmarks/src:util_lib",
         "//packages:types",
diff --git a/modules/benchmarks/src/tree/render3/BUILD.bazel b/modules/benchmarks/src/tree/render3/BUILD.bazel
index 84f49e3867f8f..d2b2136846a4d 100644
--- a/modules/benchmarks/src/tree/render3/BUILD.bazel
+++ b/modules/benchmarks/src/tree/render3/BUILD.bazel
@@ -1,7 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("@angular//:index.bzl", "ng_module")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("//tools:defaults.bzl", "ng_module")
 
 ng_module(
     name = "render3_lib",
@@ -10,7 +9,6 @@ ng_module(
             "**/*.ts",
         ],
     ),
-    tsconfig = "//packages:tsconfig",
     deps = [
         "//modules/benchmarks/src/tree:util_lib",
         "//packages:types",
diff --git a/modules/benchmarks/src/tree/render3_function/BUILD.bazel b/modules/benchmarks/src/tree/render3_function/BUILD.bazel
index ce8a2e6bcb0be..91236e044dfbd 100644
--- a/modules/benchmarks/src/tree/render3_function/BUILD.bazel
+++ b/modules/benchmarks/src/tree/render3_function/BUILD.bazel
@@ -1,7 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("@angular//:index.bzl", "ng_module")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("//tools:defaults.bzl", "ng_module")
 
 ng_module(
     name = "render3_function_lib",
@@ -10,7 +9,6 @@ ng_module(
             "**/*.ts",
         ],
     ),
-    tsconfig = "//packages:tsconfig",
     deps = [
         "//modules/benchmarks/src/tree:util_lib",
         "//modules/benchmarks/src/tree/render3:render3_lib",