| Chunk |
|---|
| Conflicting content |
|---|
// todo: apply i18n settings here somehow and extract them as templates (velocity?)
<<<<<<< HEAD
private static final String SUBSCRIPTION_NOTIFICATION_TEMPLATE =
"Dear %s!\n" +
"\n" +
"Your favorite forum has some updates.\n" +
"Please check it out at %s.\n" +
"\n" +
"Best regards,\n" +
"\n" +
"Jtalks forum.";
=======
>>>>>>> 70fe745201bdcb62e65f378f496ab5149363679a
/**
* Creates a mailing service with a default template message autowired.
* Template message contains sender address and can be configured via spring |
| Solution content |
|---|
// todo: apply i18n settings here somehow and extract them as templates (velocity?)
/**
* Creates a mailing service with a default template message autowired.
* Template message contains sender address and can be configured via spring |
| File |
|---|
| MailService.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Attribute |