scd: fix merge failure.
authorNIIBE Yutaka <gniibe@fsij.org>
Tue, 6 Jan 2015 23:15:12 +0000 (08:15 +0900)
committerNIIBE Yutaka <gniibe@fsij.org>
Tue, 6 Jan 2015 23:15:12 +0000 (08:15 +0900)
commit602f17b5a775f02e0e33a54d3155929dc00e4f53
tree93e5b9fa1027bed0349f28c2fcd3cd681499875e
parent9bf40849a9f86204e113712c4cc285f1ac16127a
scd: fix merge failure.

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

--

Thanks to Joshua Rogers for reviewing and reporting.
scd/apdu.c