diff options
| author |  Yifei Feng <yifeif@google.com> | 2018-05-29 14:08:54 -0700 |
|---|---|---|
| committer | Yifei Feng <yifeif@google.com> | 2018-05-29 14:08:54 -0700 |
| commit | 30ecb94df8f8e0b6c553a77e5c50ec99afc81824 (patch) | |
| tree | 95b2568b161a073f094508335ed3565e27764d87 /tensorflow/java/src | |
| parent | c1210643b50d8b5aca1f078ab1cd910d6d24253c (diff) | |
Fix more merge error.
Diffstat (limited to 'tensorflow/java/src')
| -rw-r--r-- | tensorflow/java/src/gen/cc/op_generator.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/tensorflow/java/src/gen/cc/op_generator.cc b/tensorflow/java/src/gen/cc/op_generator.cc index 940390bfcf..debd95fc62 100644 --- a/tensorflow/java/src/gen/cc/op_generator.cc +++ b/tensorflow/java/src/gen/cc/op_generator.cc @@ -13,9 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include <string> -#include <map> -#include <vector> #include <list> #include <map> #include <memory> @@ -26,9 +23,9 @@ limitations under the License. #include "tensorflow/core/framework/op_gen_lib.h" #include "tensorflow/core/lib/core/errors.h" #include "tensorflow/core/lib/io/path.h" -#include "tensorflow/core/platform/logging.h" +#include "tensorflow/core/lib/strings/str_util.h" #include "tensorflow/core/platform/env.h" -#include "tensorflow/core/framework/op_gen_lib.h" +#include "tensorflow/core/platform/logging.h" #include "tensorflow/java/src/gen/cc/java_defs.h" #include "tensorflow/java/src/gen/cc/op_generator.h" #include "tensorflow/java/src/gen/cc/op_specs.h" |