pkcs11: clean up a few merge errors and bits of cruft
authorDan Winship <danw@gnome.org>
Wed, 16 Nov 2011 14:39:31 +0000 (09:39 -0500)
committerDan Winship <danw@gnome.org>
Wed, 16 Nov 2011 14:45:35 +0000 (09:45 -0500)
commit1625751cdc60a4e6d220549296ea225099cece1a
treede5175bbb6ad74237d4c910f37bb7a4942a63fa0
parentb00be5e0c19610b4e5dcebce63ba218852636f32
pkcs11: clean up a few merge errors and bits of cruft
.gitignore
tls/gnutls/Makefile.am
tls/pkcs11/Makefile.am
tls/tests/Makefile.am