Projects >> MyExpenses >>df7538960c0f8aa1b2f5833e35641a74935338a0

Chunk
Conflicting content 
          getString(R.string.dialog_contrib_reminder_gain_access),
          linefeed, featureList);
      if (!feature.isExtended) {
<<<<<<< HEAD
        if (Distrib.HAS_EXTENDED) {
          String pro = getString(R.string.dialog_contrib_extended_gain_access);
          CharSequence extendedList = Utils.getContribFeatureLabelsAsFormattedList(ctx, feature, Utils.LicenceStatus.EXTENDED);
          message = TextUtils.concat(message, linefeed, pro, linefeed, extendedList);
        }
        builder.setNeutralButton(R.string.dialog_contrib_buy_premium, this);
=======
        String pro = getString(R.string.dialog_contrib_extended_gain_access);
        CharSequence extendedList = Utils.getContribFeatureLabelsAsFormattedList(ctx,feature, Utils.LicenceStatus.EXTENDED);
        message = TextUtils.concat(message,linefeed, pro, linefeed, extendedList);
        builder.setNegativeButton(R.string.dialog_contrib_buy_premium, this);
>>>>>>> 591fa6bef04064ea8fa0014accf7c4a08a3ef635
      }
    }
    builder
Solution content 
          getString(R.string.dialog_contrib_reminder_gain_access),
          linefeed, featureList);
      if (!feature.isExtended) {
        if (Distrib.HAS_EXTENDED) {
          String pro = getString(R.string.dialog_contrib_extended_gain_access);
          CharSequence extendedList = Utils.getContribFeatureLabelsAsFormattedList(ctx, feature, Utils.LicenceStatus.EXTENDED);
          message = TextUtils.concat(message, linefeed, pro, linefeed, extendedList);
        }
        builder.setNegativeButton(R.string.dialog_contrib_buy_premium, this);
      }
    }
    builder
File
ContribDialogFragment.java
Developer's decision
Combination
Kind of conflict
If statement
Method invocation
Variable
Chunk
Conflicting content 
    builder
        .setTitle(feature.isExtended ? R.string.dialog_title_extended_feature : R.string.dialog_title_contrib_feature)
        .setMessage(message)
<<<<<<< HEAD
        .setNegativeButton(R.string.dialog_contrib_no, this)
=======
        .setNeutralButton(R.string.dialog_contrib_no, this)
        .setPositiveButton(isContrib ? R.string.dialog_contrib_upgrade_extended : R.string.dialog_contrib_buy_extended, this)
>>>>>>> 591fa6bef04064ea8fa0014accf7c4a08a3ef635
        .setIcon(R.drawable.premium);
    if (Distrib.HAS_EXTENDED) {
      builder.setPositiveButton(isContrib ? R.string.dialog_contrib_upgrade_extended : R.string.dialog_contrib_buy_extended, this);
Solution content 
    builder
        .setTitle(feature.isExtended ? R.string.dialog_title_extended_feature : R.string.dialog_title_contrib_feature)
        .setMessage(message)
        .setNeutralButton(R.string.dialog_contrib_no, this)
        .setIcon(R.drawable.premium);
    if (Distrib.HAS_EXTENDED) {
      builder.setPositiveButton(isContrib ? R.string.dialog_contrib_upgrade_extended : R.string.dialog_contrib_buy_extended, this);
File
ContribDialogFragment.java
Developer's decision
Combination
Kind of conflict
Variable