Fix conflcts

8 years ago · 5e8a4f16c7
parent ee112915e3
commit 5e8a4f16c7
1 changed files with 0 additions and 1 deletions
--- a/paddle/framework/tensor.h
+++ b/paddle/framework/tensor.h
@ -19,7 +19,6 @@ limitations under the License. */
 #include <memory>
 #include <typeindex>
 #include "paddle/framework/ddim.h"
-#include "paddle/framework/tensor_types.h"
 #include "paddle/memory/memory.h"
 #include "paddle/platform/enforce.h"
 #include "paddle/platform/place.h"