Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-03-03-23-44-14

[civicrm-core.git] / CRM / Upgrade / 4.3.5.msg_template / message_templates / event_online_receipt_html.tpl

diff --git a/CRM/Upgrade/4.3.5.msg_template/message_templates/event_online_receipt_html.tpl b/CRM/Upgrade/4.3.5.msg_template/message_templates/event_online_receipt_html.tpl
index 704017e841487755da6d4dcade4dd135fb8df25a..4e86fbfb2e9819038f639a34c990678b6d8c5885 100644 (file)
--- a/CRM/Upgrade/4.3.5.msg_template/message_templates/event_online_receipt_html.tpl
+++ b/CRM/Upgrade/4.3.5.msg_template/message_templates/event_online_receipt_html.tpl
@@ -35,15 +35,12 @@
     {if $isOnWaitlist}
      <p>{ts}You have been added to the WAIT LIST for this event.{/ts}</p>
      {if $isPrimary}
-       <p>{ts}If space becomes available you will receive an email with
-a link to a web page where you can complete your registration.{/ts}</p>
+       <p>{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts}</p>
      {/if}
     {elseif $isRequireApproval}
      <p>{ts}Your registration has been submitted.{/ts}</p>
      {if $isPrimary}
-      <p>{ts}Once your registration has been reviewed, you will receive
-an email with a link to a web page where you can complete the
-registration process.{/ts}</p>
+      <p>{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts}</p>
      {/if}
     {elseif $is_pay_later && !$isAmountzero}
      <p>{$pay_later_receipt}</p> {* FIXME: this might be text rather than HTML *}