From abb8dd8a3427e1b3c8ded58c164cb5aa58d4ba9a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Agn=C3=A8s=20Li=C3=A8vre?= <agnes.lievre@education.gouv.fr>
Date: Wed, 24 Jul 2002 17:28:25 +0000
Subject: [PATCH] *** empty log message ***

---
 src/imach.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/imach.c b/src/imach.c
index 51a0902..a990eeb 100644
--- a/src/imach.c
+++ b/src/imach.c
@@ -1830,15 +1830,8 @@ void varevsij(char optionfilefiname[], double ***vareij, double **matcov, double
   }
   else 
     strcpy(digitp,"-stablbased-");
-<<<<<<< imach.c
-  if (mobilav!=0) {
-=======
-  if(mobilav!=0)
-    strcat(digitp,"mobilav-");
-  else
-    strcat(digitp,"nomobil-");
+
   if (mobilav!=0) {
->>>>>>> 1.54
     mobaverage= ma3x(1, AGESUP,1,NCOVMAX, 1,NCOVMAX);
     if (movingaverage(probs, bage, fage, mobaverage,mobilav)!=0){
       fprintf(ficlog," Error in movingaverage mobilav=%d\n",mobilav);
-- 
2.43.0