"fix conflict"

8 years ago · 37bbaabdf1
parent 8acc010691
commit 37bbaabdf1
1 changed files with 1 additions and 1 deletions
--- 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 {