resolve merge conflict

[simgrid.git] / src / surf / surf_config.c

diff --git a/src/surf/surf_config.c b/src/surf/surf_config.c
index 7de2320..b5d3589 100644 (file)
--- a/src/surf/surf_config.c
+++ b/src/surf/surf_config.c
@@ -11,7 +11,7 @@
 #include "xbt/str.h"
 #include "surf/surf_private.h"
 #include "surf/surf_routing.h" /* COORD_HOST_LEVEL and COORD_ASR_LEVEL */
-#include "simix/context.h"
+#include "simgrid/simix.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_config, surf,
                                 "About the configuration of surf (and the rest of the simulation)");