Projects >> k-9 >>97bfb5e22903858b39fe04e78da614a65d02db23

Chunk
Conflicting content 
                R.array.account_settings_message_age_values));
        s.put("messageFormat",
                new EnumSetting(Account.MessageFormat.class, Account.DEFAULT_MESSAGE_FORMAT));
<<<<<<< HEAD
        //s.put("messageFormatAuto", new BooleanSetting(Account.DEFAULT_MESSAGE_FORMAT_AUTO)); // added to version 2
=======
        s.put("messageFormatAuto", new BooleanSetting(Account.DEFAULT_MESSAGE_FORMAT_AUTO)); // added to version 2
>>>>>>> 6a02552b235d57f0271b3aa6effe59ca9d94fca4
        s.put("messageReadReceipt", new BooleanSetting(Account.DEFAULT_MESSAGE_READ_RECEIPT));
        s.put("notificationUnreadCount", new BooleanSetting(true));
        s.put("notifyMailCheck", new BooleanSetting(false));
Solution content 
                R.array.account_settings_message_age_values));
        s.put("messageFormat",
                new EnumSetting(Account.MessageFormat.class, Account.DEFAULT_MESSAGE_FORMAT));
        s.put("messageFormatAuto", new BooleanSetting(Account.DEFAULT_MESSAGE_FORMAT_AUTO)); // added to version 2
        s.put("messageReadReceipt", new BooleanSetting(Account.DEFAULT_MESSAGE_READ_RECEIPT));
        s.put("notificationUnreadCount", new BooleanSetting(true));
        s.put("notifyMailCheck", new BooleanSetting(false));
File
AccountSettings.java
Developer's decision
Version 2
Kind of conflict
Comment
Method invocation