spiceif.c contained some garbage from cvs conflict, resnoise.c did not clean INNOIZ

src/frontend/spiceif.c

@@ -190,23 +190,7 @@ if_run(char *t, char *what, wordlist *args, char *tab)
                 ft_sperror(err,"createOptions");
                 return(2);
             }
-<<<<<<< spiceif.c
-            
-/* -- *** BUG! ****/
-/* -- Inherit the default simulation settings taken from the */
-/* -- .option line.                                          */
 
-=======
-            
-/* -- *** BUG! ****/
-/* -- Inherit the default simulation settings taken from the */
-/* -- .option line.                                          */
-
-/*            memcpy(&ft_curckt->ci_specOpt->TSKtemp,
-                   &ft_curckt->ci_defOpt->TSKtemp,
-                   sizeof(TSKtask) - offsetof(TSKtask, TSKtemp));
-*/
->>>>>>> 1.7
             ft_curckt->ci_curOpt  = ft_curckt->ci_specOpt;
 
         }

src/spicelib/devices/res/resnoise.c

@@ -113,6 +113,7 @@ if (!data->namelist) return(E_NOMEM);
 
 			if (data->freq == ((NOISEAN*)ckt->CKTcurJob)->NstartFreq) {
 			    inst->RESnVar[OUTNOIZ] = 0.0;
+			    inst->RESnVar[INNOIZ] = 0.0;  /* Clear input noise */ 
 			}
 		    } else {   /* data->delFreq != 0.0 (we have to integrate) */
 			tempOutNoise = Nintegrate(noizDens, lnNdens,