.gitignore should now be working.

[Faustine.git] / README

diff --git a/README b/README
index 2b3256b..3285a0d 100644 (file)
--- a/README
+++ b/README
@@ -66,3 +66,4 @@ Emacs Info files.  It is available on the World Wide Web, at
         http://caml.inria.fr/
 
 git test
+Merge test