Fix more merge error.
authorYifei Feng <yifeif@google.com>
Tue, 29 May 2018 21:08:54 +0000 (14:08 -0700)
committerYifei Feng <yifeif@google.com>
Tue, 29 May 2018 21:08:54 +0000 (14:08 -0700)
commit30ecb94df8f8e0b6c553a77e5c50ec99afc81824
tree95b2568b161a073f094508335ed3565e27764d87
parentc1210643b50d8b5aca1f078ab1cd910d6d24253c
Fix more merge error.
tensorflow/java/src/gen/cc/op_generator.cc