Fix conflcts

5e8a4f16 · liaogang · ee112915 · 5e8a4f16
隐藏空白更改
内联并排

Showing with 0 addition and 1 deletion

paddle/framework/tensor.h paddle/framework/tensor.h +0 -1

未找到文件。
--- 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"