werner committed to gnupg/g10

[cvs@cvs.gnupg.org]

Date:	Friday August 16, 2002 @ 9:14
Author:	werner

Update of /cvs/gnupg/gnupg/g10
In directory trithemius:/tmp/cvs-serv11303

Modified Files:
	ChangeLog 
Log Message:
Removed a leftover conflict indicator.

File: ChangeLog        	Status: Up-to-date