diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-09 16:39:26 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-09 16:39:26 +0200 |
| commit | a9c3d6b5070ccff0f01f4dab91e094b1019d782f (patch) | |
| tree | 001cb84e8309858545f5032b5d01f59dc5e36576 /OpenKeychain-Test/src/test/resources | |
| parent | 718acbf954b1318c6a90ba0f9c79e63f398fb498 (diff) | |
| parent | 78b0c5e74a13aa33ccbb7cbfff86f7a02d977429 (diff) | |
| download | open-keychain-a9c3d6b5070ccff0f01f4dab91e094b1019d782f.tar.gz open-keychain-a9c3d6b5070ccff0f01f4dab91e094b1019d782f.tar.bz2 open-keychain-a9c3d6b5070ccff0f01f4dab91e094b1019d782f.zip | |
Merge remote-tracking branch 'artbristol/functional-testing-canonicalize-badsignature' into external-test
Conflicts:
OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
Diffstat (limited to 'OpenKeychain-Test/src/test/resources')
| -rw-r--r-- | OpenKeychain-Test/src/test/resources/public-key-canonicalize.blob | bin | 0 -> 1224 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/OpenKeychain-Test/src/test/resources/public-key-canonicalize.blob b/OpenKeychain-Test/src/test/resources/public-key-canonicalize.blob Binary files differnew file mode 100644 index 000000000..3450824c1 --- /dev/null +++ b/OpenKeychain-Test/src/test/resources/public-key-canonicalize.blob |