*** empty log message ***

diff --git a/src/imach.c b/src/imach.c
index 51a090213af151529768aec9da32787e2ac34108..a990eeb7c4c7b0f3eedceb5690038faa10dba7ac 100644 (file)
--- 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);