| Chunk |
|---|
| Conflicting content |
|---|
.getString(PREFERENCE_LAST_EXPORT_TIME_KEY,
TimestampHelper.getUtcStringFromTimestamp(TimestampHelper.getTimestampFromEpochZero()));
Log.d(LOG_TAG, "Retrieving '" + utcString + "' as lastExportTime from Android Preferences.");
<<<<<<< HEAD
return TimestampHelper.getTimestampFromUtcString(utcString);
=======
return PREFERENCE_LAST_EXPORT_TIME_DEFAULT_VALUE.equals(utcString) ?
TimestampHelper.getTimestampFromEpochZero() : TimestampHelper.getTimestampFromUtcString(utcString);
>>>>>>> f5e8cac3548e26caa463860a1eb96ebf3aa33087
}
} |
| Solution content |
|---|
.getString(PREFERENCE_LAST_EXPORT_TIME_KEY,
TimestampHelper.getUtcStringFromTimestamp(TimestampHelper.getTimestampFromEpochZero()));
Log.d(LOG_TAG, "Retrieving '" + utcString + "' as lastExportTime from Android Preferences.");
return TimestampHelper.getTimestampFromUtcString(utcString);
}
} |
| File |
|---|
| PreferencesHelper.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Return statement |
| Variable |