--- imach/src/imach.c	2014/06/16 10:20:28	1.146
+++ imach/src/imach.c	2014/06/16 10:33:11	1.147
@@ -1,6 +1,9 @@
-/* $Id: imach.c,v 1.146 2014/06/16 10:20:28 brouard Exp $
+/* $Id: imach.c,v 1.147 2014/06/16 10:33:11 brouard Exp $
   $State: Exp $
   $Log: imach.c,v $
+  Revision 1.147  2014/06/16 10:33:11  brouard
+  *** empty log message ***
+
   Revision 1.146  2014/06/16 10:20:28  brouard
   Summary: Merge
   Author: Brouard
@@ -483,20 +486,11 @@ extern int errno;
 #define ODIRSEPARATOR '/'
 #endif
 
-<<<<<<< imach.c
-/* $Id: imach.c,v 1.146 2014/06/16 10:20:28 brouard Exp $ */
-=======
-/* $Id: imach.c,v 1.146 2014/06/16 10:20:28 brouard Exp $ */
->>>>>>> 1.145
+/* $Id: imach.c,v 1.147 2014/06/16 10:33:11 brouard Exp $ */
 /* $State: Exp $ */
 
-<<<<<<< imach.c
-char version[]="Imach version 0.98nR2, January 2014,INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121)";
-char fullversion[]="$Revision: 1.146 $ $Date: 2014/06/16 10:20:28 $"; 
-=======
 char version[]="Imach version 0.98nR2, January 2014,INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121)";
-char fullversion[]="$Revision: 1.146 $ $Date: 2014/06/16 10:20:28 $"; 
->>>>>>> 1.145
+char fullversion[]="$Revision: 1.147 $ $Date: 2014/06/16 10:33:11 $"; 
 char strstart[80];
 char optionfilext[10], optionfilefiname[FILENAMELENGTH];
 int erreur=0, nberr=0, nbwarn=0; /* Error number, number of errors number of warnings  */