On Thu Dec 14 21:50:03 1995, The Source of All Evil wrote:

Why does noone fix this conflicts ?

Bernd

> tls
> Thu Dec 14 15:48:16 EST 1995
> Update of /a/cvsroot/src/sys/dev/pci
> In directory pain.lcs.mit.edu:/b/tmp/cvs-serv13913
> 
> Revision/Branch: 1.1.1
> 
> Log Message:
> 95/12/12 snapshot of Matt Thomas's 'de' driver
> 
> Status:
> 
> Vendor Tag:	thomas
> Release Tags:	de-951212
> 		
> C src/sys/dev/pci/if_de.c
> 
> 1 conflicts created by this import.
> Use the following command to help the merge:
> 
> 	cvs checkout -jthomas:yesterday -jthomas src/sys/dev/pci
> 
> 
> tls
> Thu Dec 14 15:49:03 EST 1995
> Update of /a/cvsroot/src/sys/dev/ic
> In directory pain.lcs.mit.edu:/b/tmp/cvs-serv13938
> 
> Revision/Branch: 1.1.1
> 
> Log Message:
> 95/12/12 snapshot of Matt Thomas's 'de' driver
> 
> Status:
> 
> Vendor Tag:	thomas
> Release Tags:	de-951212
> 		
> C src/sys/dev/ic/dc21040reg.h
> 
> 1 conflicts created by this import.
> Use the following command to help the merge:
> 
> 	cvs checkout -jthomas:yesterday -jthomas src/sys/dev/ic
> 
>