Fixed conflict
authorAG Ramesh <ag.ramesh@intel.com>
Sat, 19 May 2018 23:27:24 +0000 (16:27 -0700)
committerGitHub <noreply@github.com>
Sat, 19 May 2018 23:27:24 +0000 (16:27 -0700)
commit2457cae17047dc35479e02fd937d842bc691cecb
tree6e59b65ee02c6271ec86ee2f914e1747c419bf42
parent2ab15a94b133c05b72d3282263ee8d744fd11007
Fixed conflict
tensorflow/workspace.bzl