commit 83d7587a56179bdf70d2cf3cfa21fefa887d0dc5
author Katherine Tian <kattian@google.com> Fri Aug 07 23:20:23 2020 +0000
committer Katherine Tian <kattian@google.com> Fri Aug 07 23:20:23 2020 +0000
tree 75e03354bae19d0ca5cf96d99bc0c55a1abf3c77
parent 46ad0d84d1790d246885357d771b126098a87660

resolve map_kernel conflicts

tensorflow/core/kernels/map_kernels.cc

diff --git a/tensorflow/core/kernels/map_kernels.cc b/tensorflow/core/kernels/map_kernels.cc
index 26f67c5..19b79a2 100644
--- a/tensorflow/core/kernels/map_kernels.cc
+++ b/tensorflow/core/kernels/map_kernels.cc
@@ -52,4 +52,5 @@
 REGISTER_UNARY_VARIANT_UNARY_OP_FUNCTION(ZEROS_LIKE_VARIANT_UNARY_OP,
                                          DEVICE_CPU, TensorMap,
                                          TensorMapZerosLike<CPUDevice>);
-}
+
+} // namespace tensorflow

tensorflow/core/kernels/map_kernels.h

diff --git a/tensorflow/core/kernels/map_kernels.h b/tensorflow/core/kernels/map_kernels.h
index 5031ad9..4e2618b 100644
--- a/tensorflow/core/kernels/map_kernels.h
+++ b/tensorflow/core/kernels/map_kernels.h
@@ -20,8 +20,6 @@
 #include "tensorflow/core/framework/variant_encode_decode.h"
 #include "tensorflow/core/util/tensor_ops_util.h"
 
-#include <iostream>
-
 namespace tensorflow {
 
 
@@ -214,6 +212,7 @@
   return Status::OK();
 }
 
+
 }  // namespace tensorflow
 
 #endif  // TENSORFLOW_CORE_KERNELS_MAP_KERNELS_H_