From 10ba65efab8f66b5336abfcad76f02362d1fafd1 Mon Sep 17 00:00:00 2001
From: Jinjing Zhou <VoVAllen@users.noreply.github.com>
Date: Thu, 2 Jul 2020 15:35:28 +0800
Subject: [PATCH] Update tfe_wrapper.cc

---
 tensorflow/python/tfe_wrapper.cc | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/tensorflow/python/tfe_wrapper.cc b/tensorflow/python/tfe_wrapper.cc
index a0ecf0ce546..88bb66f189b 100644
--- a/tensorflow/python/tfe_wrapper.cc
+++ b/tensorflow/python/tfe_wrapper.cc
@@ -1169,13 +1169,9 @@ PYBIND11_MODULE(_pywrap_tfe, m) {
 
     PyCapsule_SetName(pycapsule.ptr(), "used_dltensor");
     PyCapsule_SetDestructor(pycapsule.ptr(), nullptr);
-<<<<<<< HEAD
-    return py::handle(EagerTensorFromHandle(thandle));
-=======
     
     PyObject* pyhandle = EagerTensorFromHandle(thandle);
     return tensorflow::PyoOrThrow(pyhandle);
->>>>>>> ce9b1295b5... fix
   });
 
   m.def("TFE_Py_RegisterCustomDevice", [](const py::handle& context,