resolve merge conflict

[simgrid.git] / doc / gtut-tour-12-staticstruct.doc

diff --git a/doc/gtut-tour-12-staticstruct.doc b/doc/gtut-tour-12-staticstruct.doc
index d161753..1327b78 100644 (file)
--- a/doc/gtut-tour-12-staticstruct.doc
+++ b/doc/gtut-tour-12-staticstruct.doc
@@ -5,7 +5,7 @@
  - \ref GRAS_tut_tour_staticstruct_intro
  - \ref GRAS_tut_tour_staticstruct_use
  - \ref GRAS_tut_tour_staticstruct_recap
-   
+
 <hr>
 
 \section GRAS_tut_tour_staticstruct_intro Introduction
@@ -17,10 +17,10 @@
 \section GRAS_tut_tour_staticstruct_recap Recapping everything together
 
 The program now reads:
-\include 11-staticstruct.c
+include 11-staticstruct.c
 
 Which produces the expected output:
-\include 11-staticstruct.output
+include 11-staticstruct.output
 
 
 */