Projects >> SMSSync >>a3f32e760f1e4e03f8b3350b724b77bfa6c8a377

Chunk
Conflicting content 
<<<<<<< HEAD
        enableLog = settings.getBoolean("EnableLog", false);
        batteryLevel = settings.getInt("BatteryLevel", 0);
        alertPhoneNumber = settings.getString("AlertPhoneNumber", "");
        smsReportDelivery = settings.getBoolean("SmsReportDelivery", false);
=======
        messageResultsAPIEnable = settings.getBoolean("MessageResultsAPIEnable", false);
>>>>>>> bc9125dc30f2833e4ac24ec01ecf1db7debbbf77
    }

    /**
Solution content 
        enableLog = settings.getBoolean("EnableLog", false);
        batteryLevel = settings.getInt("BatteryLevel", 0);
        alertPhoneNumber = settings.getString("AlertPhoneNumber", "");
        smsReportDelivery = settings.getBoolean("SmsReportDelivery", false);
		messageResultsAPIEnable = settings.getBoolean("MessageResultsAPIEnable", false);
    }

    /**
File
Prefs.java
Developer's decision
Concatenation
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
        editor.putBoolean("EnableLog", enableLog);
        editor.putInt("BatteryLevel", batteryLevel);
        editor.putString("AlertPhoneNumber", alertPhoneNumber);
<<<<<<< HEAD
        editor.putBoolean("SmsReportDelivery", smsReportDelivery);
=======
        editor.putBoolean("MessageResultsAPIEnable", messageResultsAPIEnable);
>>>>>>> bc9125dc30f2833e4ac24ec01ecf1db7debbbf77
        editor.commit();
    }
Solution content 
        editor.putBoolean("EnableLog", enableLog);
        editor.putInt("BatteryLevel", batteryLevel);
        editor.putString("AlertPhoneNumber", alertPhoneNumber);
		editor.putBoolean("SmsReportDelivery", smsReportDelivery);
        editor.putBoolean("MessageResultsAPIEnable", messageResultsAPIEnable);
        editor.commit();
    }
File
Prefs.java
Developer's decision
Concatenation
Kind of conflict
Method invocation