slightly change wording in merge logs

2014-10-25 02:50:44 +02:00
parent c5028dc9ce
commit 748049fb5b
2 changed files with 3 additions and 2 deletions
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
@@ -787,6 +787,7 @@ public class UncachedKeyRing {
     */
    public UncachedKeyRing merge(UncachedKeyRing other, OperationLog log, int indent) {

+        // This is logged in the calling method to provide more meta info
        // log.add(isSecret() ? LogType.MSG_MG_SECRET : LogType.MSG_MG_PUBLIC,
                // indent, KeyFormattingUtils.convertKeyIdToHex(getMasterKeyId()));
        indent += 1;