fixed merge conflicts

[civicrm-core.git] / templates / CRM / Admin / Form / Setting / Mail.tpl

diff --git a/templates/CRM/Admin/Form/Setting/Mail.tpl b/templates/CRM/Admin/Form/Setting/Mail.tpl
index 8eb4a74b0c13408e4ed4fbfe3515ebe336b0f5cc..63e6fb2c2479d790358054b991bc221471d1d404 100644 (file)
--- a/templates/CRM/Admin/Form/Setting/Mail.tpl
+++ b/templates/CRM/Admin/Form/Setting/Mail.tpl
@@ -26,7 +26,7 @@
 {capture assign=docLink}{docURL page="CiviMail Mailer Settings" text="CiviMail Mailer Settings and Optimization" resource="wiki"}{/capture}
 <div class="crm-block crm-form-block crm-mail-form-block">
 <div id="help">
-    {ts 1=$docLink}These settings are used to configure mailer properties for the optional CiviMail component and may allow you to significantly optimize performance. Please read the %1 documentation, and make sure you understand it before modifying default values. (These settings are NOT used for the built-in 'Send Email to Contacts' feature).{/ts}
+    {ts 1=$docLink}These settings are used to configure mailer properties for the optional CiviMail component and may allow you to significantly optimize performance. Please read the %1 documentation, and make sure you understand it before modifying default values. (These settings are NOT used for the built-in 'Email - send now' feature).{/ts}
 </div>
 <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
       <table class="form-layout-compressed">