Projects >> tatami >>620f39e950d7e3cc6c2774d6b38e1dd050f2c49b

Chunk
Conflicting content 
import javax.annotation.PostConstruct;
import javax.inject.Inject;
<<<<<<< HEAD
import java.util.Collection;
import java.util.List;
=======
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
>>>>>>> 8356fbed8e762b8aa1cd23630ed2dedf840eb22b

/**
 * Send e-mails.
Solution content 
import javax.annotation.PostConstruct;
import javax.inject.Inject;

import java.util.*;

/**
 * Send e-mails.
File
MailService.java
Developer's decision
Manual
Kind of conflict
Import
Chunk
Conflicting content 
        }
    }

<<<<<<< HEAD
=======
    /**
     * generate and send the mail corresponding to the given template
     *
     * @param user
     * @param model
     * @param template
     * @param locale
     */
    private void sendTextFromTemplate(User user, Map model, String template, Locale locale) {
        model.put("messages", mailMessageSource);
        model.put("locale", locale);

        String subject =  mailMessageSource.getMessage(template+".title", null, locale);
        String text =VelocityEngineUtils.mergeTemplateIntoString(velocityEngine, templateRoot+ template+ templateSuffix,
                "utf-8", model);
        if (log.isDebugEnabled()) {
            log.debug("e-mail text  '" + text);
        }

        sendEmail(user, subject, text);
    }
>>>>>>> 8356fbed8e762b8aa1cd23630ed2dedf840eb22b
}
Solution content 
        }
    }

    /**
     * generate and send the mail corresponding to the given template
     *
     * @param user
     * @param model
     * @param template
     * @param locale
     */
    private void sendTextFromTemplate(User user, Map model, String template, Locale locale) {
        model.put("messages", mailMessageSource);
        model.put("locale", locale);

        String subject =  mailMessageSource.getMessage(template+".title", null, locale);
        String text =VelocityEngineUtils.mergeTemplateIntoString(velocityEngine, templateRoot+ template+ templateSuffix,
                "utf-8", model);
        if (log.isDebugEnabled()) {
            log.debug("e-mail text  '" + text);
        }

        sendEmail(user, subject, text);
    }

}
File
MailService.java
Developer's decision
Version 2
Kind of conflict
Comment
Method declaration