Projects >> apg >>e457d4c9097cb3f2e1c6305609cfacff1c5c38c2

Chunk
Conflicting content 
                                continue;
                            }
                            // warn user if the signature was made with bad encoding
<<<<<<< HEAD
                            if (!cert.verifySignature(masterKey, userId)) {
                                log.add(LogType.MSG_KC_UID_WARN_ENCODING, indent);
=======
                            if (!Utf8Util.isValidUTF8(rawUserId)) {
                                log.add(LogLevel.WARN, LogType.MSG_KC_UID_WARN_ENCODING, indent);
>>>>>>> 40751bceb586d12da671966c1ad5661223819c5b
                            }
                        } catch (PgpGeneralException e) {
                            log.add(LogType.MSG_KC_UID_BAD_ERR,
Solution content 
                                continue;
                            }
                            // warn user if the signature was made with bad encoding
                            if (!Utf8Util.isValidUTF8(rawUserId)) {
                                log.add(LogType.MSG_KC_UID_WARN_ENCODING, indent);
                            }
                        } catch (PgpGeneralException e) {
                            log.add(LogType.MSG_KC_UID_BAD_ERR,
File
UncachedKeyRing.java
Developer's decision
Combination
Kind of conflict
If statement
Method invocation