Projects >> social >>5b1e50646495e6242efc0012f5f23dc87b796f77

Chunk
Conflicting content 
  public NotificationInfo makeNotification(NotificationContext ctx) {
    ExoSocialActivity activity = ctx.value(SocialNotificationUtils.ACTIVITY);
    
<<<<<<< HEAD
    List receivers = new ArrayList();
    if (activity.getMentionedIds().length > 0) {
      Utils.sendToMentioners(receivers, activity.getMentionedIds(), activity.getPosterId());
    } else {
      receivers = Utils.getMentioners(activity.getTemplateParams().get("comment"), activity.getPosterId());
    }
=======
    Set receivers = new HashSet();
    Utils.sendToMentioners(receivers, activity.getMentionedIds(), activity.getPosterId());
>>>>>>> 7963f3db6721a874c866a1146865b0392ac2f70d

    return NotificationInfo.instance().key(getKey())
           .to(new ArrayList(receivers))
Solution content 
  public NotificationInfo makeNotification(NotificationContext ctx) {
    ExoSocialActivity activity = ctx.value(SocialNotificationUtils.ACTIVITY);
    
    Set receivers = new HashSet();
    if (activity.getMentionedIds().length > 0) {
      Utils.sendToMentioners(receivers, activity.getMentionedIds(), activity.getPosterId());
    } else {
      receivers = Utils.getMentioners(activity.getTemplateParams().get("comment"), activity.getPosterId());
    }

    return NotificationInfo.instance().key(getKey())
           .to(new ArrayList(receivers))
File
ActivityMentionPlugin.java
Developer's decision
Combination
Kind of conflict
If statement
Method invocation
Variable