Subject: xsrc/30599: xdm.man contains a conflict
To: None <xsrc-manager@netbsd.org, gnats-admin@netbsd.org,>
From: Juergen Hannken-Illjes <hannken@eis.cs.tu-bs.de>
List: netbsd-bugs
Date: 06/25/2005 16:43:00 
>Number:         30599
>Category:       xsrc
>Synopsis:       xdm.man contains a conflict
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    xsrc-manager
>State:          open
>Class:          doc-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Jun 25 16:43:00 +0000 2005
>Originator:     Juergen Hannken-Illjes
>Release:        NetBSD 3.0_BETA
>Organization:
	
>Environment:
	
	
>Description:
	xfree/xc/programs/xdm/xdm.man contains two conflicts.  Look for

	<<<<<<< xdm.man
	...
	>>>>>>> 1.1.1.8

	Should go to NetBSD 3.0 too.
	
>How-To-Repeat:
	
>Fix:
	

>Unformatted: