remove some CVS conflict cruft
authorMarcus Brinkmann <mb@g10code.com>
Tue, 20 Nov 2001 06:03:02 +0000 (06:03 +0000)
committerMarcus Brinkmann <mb@g10code.com>
Tue, 20 Nov 2001 06:03:02 +0000 (06:03 +0000)
commit01b5f56f83d57a402cfc8e67d688b4635da17ab0
treedc35511e0d557b97dc2cea3d44ea636586e9ef9d
parent8cd36853821f726f9b40719aaee5d3e215efb3f1
remove some CVS conflict cruft
trunk/gpgme/ChangeLog