"fix conflict"

37bbaabd · dongzhihong · 8acc0106 · 37bbaabd
隐藏空白更改
内联并排

Showing with 1 addition and 1 deletion

paddle/framework/op_info.h paddle/framework/op_info.h +1 -1

未找到文件。
--- a/paddle/framework/op_info.h
+++ b/paddle/framework/op_info.h
@@ -20,7 +20,7 @@
 #include "paddle/framework/attribute.h"
 #include "paddle/framework/op_desc.h"
 #include "paddle/framework/type_defs.h"
-
+#include "paddle/platform/macros.h"

 namespace paddle {
 namespace framework {