Fixed conflicts - Adrien

[simgrid.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 0d0cf6f..5c2ec2a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -94,12 +94,6 @@ doc/footer.html
 *.doc.toc
 doc/latex/
 doc/html
-doc/user_guide/html
-doc/user_guide/latex
-doc/ref_guide/html
-doc/ref_guide/latex
-doc/dev_guide/html
-doc/dev_guide/latex
 doc/index.php
 doc/simgrid.tag
 doc/doxygen/logcategories.doc
@@ -159,6 +153,7 @@ examples/msg/mc/test/snapshot_comparison_liveness2
 examples/msg/mc/test/snapshot_comparison_liveness3
 examples/msg/mc/test/snapshot_comparison_liveness4
 examples/msg/mc/test/snapshot_comparison_liveness5
+examples/msg/chainsend/chainsend
 examples/msg/chord/chord
 examples/msg/chord/chord_stateful
 examples/msg/chord/deployments