Subject: Re: daily CVS update output
To: None <source@NetBSD.ORG>
From: matthew green <mrg@eterna.com.au>
List: current-users
Date: 04/22/1997 21:55:38 
   
   RCS file: /cvsroot/src/lib/libc/stdlib/Makefile.inc,v
   retrieving revision 1.29
   retrieving revision 1.30
   Merging differences between 1.29 and 1.30 into Makefile.inc
   rcsmerge: warning: conflicts during merge
   cvs server: conflicts found in src/lib/libc/stdlib/Makefile.inc
   C src/lib/libc/stdlib/Makefile.inc


i have fixed this.


.mrg.