diff options
author | Andrew Harp <andrew.harp@gmail.com> | 2018-01-29 13:19:44 -0500 |
---|---|---|
committer | Andrew Harp <andrew.harp@gmail.com> | 2018-01-29 13:19:44 -0500 |
commit | 7d5d52ea1aa3ed78e14a379d645922b58e94422c (patch) | |
tree | 6cc3668190ce4c07158ba8f2ddeea43dd02179c4 /tensorflow/cc | |
parent | f7cbb757cf51143a1c7d9db5a812ac165941adf4 (diff) | |
parent | 197f573f3bd830bbc4dc277e7c8b8cfaca65e14a (diff) |
Fixing merge conflicts
Diffstat (limited to 'tensorflow/cc')
-rw-r--r-- | tensorflow/cc/tools/BUILD | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tensorflow/cc/tools/BUILD b/tensorflow/cc/tools/BUILD index 0a7c37383f..97f66e79b8 100644 --- a/tensorflow/cc/tools/BUILD +++ b/tensorflow/cc/tools/BUILD @@ -23,7 +23,6 @@ cc_library( "//tensorflow/core:core_cpu", "//tensorflow/core:lib", "//tensorflow/core:protos_all_cc", - "//tensorflow/core:tensorflow", ], ) |