Fixing raspberry pi file for conflict.
authorAmit Patankar <amitpatankar@google.com>
Mon, 4 Jun 2018 21:26:09 +0000 (14:26 -0700)
committerGunhan Gulsoy <gunan@google.com>
Tue, 5 Jun 2018 03:39:49 +0000 (20:39 -0700)
commitbedf4eeb1361ef1483d9a0a6575f8c74d2eee572
tree06d50d5c7aa21b0c927e7d8485c2f43fcf77dd22
parent0bb7c844dd4375d7f53c88a7eacf78b0d6552498
Fixing raspberry pi file for conflict.
tensorflow/tools/ci_build/pi/build_raspberry_pi.sh
tensorflow/tools/ci_build/windows/cpu/pip/build_tf_windows.sh
tools/bazel.rc