Fix merge error.
authorYifei Feng <yifeif@google.com>
Tue, 29 May 2018 20:39:54 +0000 (13:39 -0700)
committerYifei Feng <yifeif@google.com>
Tue, 29 May 2018 20:39:54 +0000 (13:39 -0700)
commitc1210643b50d8b5aca1f078ab1cd910d6d24253c
tree1792e06df28d565a3d1f14934445185517bb0673
parent48d13f510b70e48b61a435011f78bfef4df55c9b
Fix merge error.
tensorflow/contrib/tensorrt/BUILD
tensorflow/workspace.bzl