Projects >> open-keychain >>19ecd5f42717ea325cb646b46ab06b9340015875

Chunk
Conflicting content
    private long mSigningKeyId = Constants.key.none;
    private Passphrase mPassphrase = new Passphrase();

<<<<<<< HEAD
    private ArrayList mInputUris = new ArrayList<>();
=======
>>>>>>> d67b546ec52c94faf71733b063856de98d66ef01
    private ArrayList mOutputUris = new ArrayList<>();

    private RecyclerView mSelectedFiles;
Solution content
    private long mSigningKeyId = Constants.key.none;
    private Passphrase mPassphrase = new Passphrase();
    private ArrayList mOutputUris = new ArrayList<>();

    private RecyclerView mSelectedFiles;
File
EncryptFilesFragment.java
Developer's decision
Version 2
Kind of conflict
Attribute