diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-10-04 15:42:36 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-10-04 15:42:36 +0200 |
| commit | 7891560fc2ab46951d952b0ed9000fe007a4fe10 (patch) | |
| tree | e4faf17bc9092ea46b16e770df297c5942403a7a /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java | |
| parent | a29d6b0ef3a09693478d89cd298f331089d71ab2 (diff) | |
| parent | 0e0e3d8dd09deb2ff36d46ccceba08bb5c0967ce (diff) | |
| download | open-keychain-7891560fc2ab46951d952b0ed9000fe007a4fe10.tar.gz open-keychain-7891560fc2ab46951d952b0ed9000fe007a4fe10.tar.bz2 open-keychain-7891560fc2ab46951d952b0ed9000fe007a4fe10.zip | |
Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java index dd0549adc..c3320ed6a 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java @@ -38,7 +38,6 @@ import org.sufficientlysecure.keychain.service.results.OperationResult.Operation import org.sufficientlysecure.keychain.service.results.ImportKeyResult; import org.sufficientlysecure.keychain.service.results.SaveKeyringResult; import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils; -import org.sufficientlysecure.keychain.util.IterableIterator; import org.sufficientlysecure.keychain.util.Log; import org.sufficientlysecure.keychain.util.ProgressScaler; |