Projects >> open-keychain >>31ffcb5db07dff8c248a91a791eeda2946dbbb19

Chunk
Conflicting content 
        String message = getArguments().getString(ARG_MESSAGE);
        int style = getArguments().getInt(ARG_STYLE);
        boolean cancelable = getArguments().getBoolean(ARG_CANCELABLE);
<<<<<<< HEAD
        dialog.setMessage(getString(messageId));
=======

        dialog.setMessage(message);
>>>>>>> c9b117b7068d471c5ea74b4e21d44684a31e4df6
        dialog.setProgressStyle(style);

        if (cancelable) {
Solution content 
        String message = getArguments().getString(ARG_MESSAGE);
        int style = getArguments().getInt(ARG_STYLE);
        boolean cancelable = getArguments().getBoolean(ARG_CANCELABLE);

        dialog.setMessage(message);
        dialog.setProgressStyle(style);

        if (cancelable) {
File
ProgressDialogFragment.java
Developer's decision
Version 2
Kind of conflict
Method invocation