Home GnuPG
Diffusion GnuPG 602f17b5a775

scd: fix merge failure.
602f17b5a775Unpublished

Unpublished Commit · Learn More

Not On Permanent Ref: This commit is not an ancestor of any permanent ref.

Description

scd: fix merge failure.

* scd/apdu.c (pcsc_pinpad_verify): Remove wrong lines inserted by
merge.

Thanks to Joshua Rogers for reviewing and reporting.

Details

Provenance
gniibeAuthored on Jan 7 2015, 12:15 AM
Parents
rG9bf40849a9f8: sm,g13: Init local vars to avoid compiler warnings.
Branches
Unknown
Tags
Unknown

Event Timeline

NIIBE Yutaka <gniibe@fsij.org> committed rG602f17b5a775: scd: fix merge failure. (authored by NIIBE Yutaka <gniibe@fsij.org>).Jan 7 2015, 12:15 AM