diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-12-30 16:24:20 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-12-30 16:24:20 +0100 |
| commit | 71c53f13ece742c4c3673ef1939313af84e92eb6 (patch) | |
| tree | 61b86fc54ed02932cbf6bbbe76ff3b7a74fd5521 /OpenKeychain-Test/src | |
| parent | 9e663237b6dc4880bcdb1c763374c44f9f4416d2 (diff) | |
| download | open-keychain-71c53f13ece742c4c3673ef1939313af84e92eb6.tar.gz open-keychain-71c53f13ece742c4c3673ef1939313af84e92eb6.tar.bz2 open-keychain-71c53f13ece742c4c3673ef1939313af84e92eb6.zip | |
fix small merge conflict oversight
Diffstat (limited to 'OpenKeychain-Test/src')
0 files changed, 0 insertions, 0 deletions