| Chunk |
|---|
| Conflicting content |
|---|
UI_LANGUAGE(R.string.pref_ui_language_key),
APP_DIR(R.string.pref_app_dir_key),
CATEGORY_CONTRIB(R.string.pref_category_contrib_key),
<<<<<<< HEAD
LICENSE_STATUS("licenseStatus"),
LICENSE_RETRY_COUNT("retryCount"),
LICENSE_INITIAL_TIMESTAMP("licenseInitialTimeStamp"),
=======
ACCOUNT_GROUPING(R.string.pref_account_grouping_key),
>>>>>>> b24dc4948f9aa898636692acd42c04bcaf320486
PLANNER_CALENDAR_PATH("planner_calendar_path"),
CURRENT_VERSION("currentversion"),
CURRENT_ACCOUNT("current_account"), |
| Solution content |
|---|
UI_LANGUAGE(R.string.pref_ui_language_key),
APP_DIR(R.string.pref_app_dir_key),
CATEGORY_CONTRIB(R.string.pref_category_contrib_key),
LICENSE_STATUS("licenseStatus"),
LICENSE_RETRY_COUNT("retryCount"),
LICENSE_INITIAL_TIMESTAMP("licenseInitialTimeStamp"),
ACCOUNT_GROUPING(R.string.pref_account_grouping_key),
PLANNER_CALENDAR_PATH("planner_calendar_path"),
CURRENT_VERSION("currentversion"),
CURRENT_ACCOUNT("current_account"), |
| File |
|---|
| MyApplication.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Enum value |
| Chunk |
|---|
| Conflicting content |
|---|
} else {
learn_more.setVisibility(View.VISIBLE);
learn_more.setTag(resId);
<<<<<<< HEAD
Spannable span = Spannable.Factory.getInstance().newSpannable(getString(R.string.learn_more));
=======
Spannable span = Spannable.Factory.getInstance().newSpannable(res.getString(R.string.learn_more));
>>>>>>> b24dc4948f9aa898636692acd42c04bcaf320486
span.setSpan(new ClickableSpan() {
@Override
public void onClick(View v) { |
| Solution content |
|---|
} else {
learn_more.setVisibility(View.VISIBLE);
learn_more.setTag(resId);
Spannable span = Spannable.Factory.getInstance().newSpannable(res.getString(R.string.learn_more));
span.setSpan(new ClickableSpan() {
@Override
public void onClick(View v) { |
| File |
|---|
| VersionDialogFragment.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Method invocation |
| Variable |