Removed a leftover conflict indicator.
authorWerner Koch <wk@gnupg.org>
Fri, 16 Aug 2002 07:14:29 +0000 (07:14 +0000)
committerWerner Koch <wk@gnupg.org>
Fri, 16 Aug 2002 07:14:29 +0000 (07:14 +0000)
commite78e69f37a977a283a6155850f79d4e8d5f9b3b2
tree2cba3f2ffe55788c3988d8ca7dc87519c5b5f870
parent0996f7d4dfc81b69814063c8ca829be4ac793d55
Removed a leftover conflict indicator.
g10/ChangeLog