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)
commit4d3ab72fe5d24f2ee4c1d56ed7d58ac915a6c4f8
tree04652efc86711a85a12555d8ca081689f2acc4a7
parentad428df905444b0a269057d89640d0511e8bdf4f
remove some CVS conflict cruft
gpgme/ChangeLog