From: joannechester <j_chester@optusnet.com.au>
Date: Sun, 16 Aug 2015 06:50:19 +0000 (+1000)
Subject: reverting-conflict
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=44fd908483cc788a78f35d4d8a9e1cbdd7cac34d;p=civicrm-core.git

reverting-conflict
---

diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php
index 55db953b93..76b1abfed5 100644
--- a/CRM/Contribute/BAO/Contribution.php
+++ b/CRM/Contribute/BAO/Contribution.php
@@ -4180,7 +4180,6 @@ LIMIT 1;";
       if (empty($input['IAmAHorribleNastyBeyondExcusableHackInTheCRMEventFORMTaskClassThatNeedsToBERemoved'])) {
         $eventDetail = civicrm_api3('Event', 'getsingle', array('id' => $objects['event']->id));
         $contributionParams['source'] = ts('Online Event Registration') . ': ' . $eventDetail['title'];
-
         if ($eventDetail['is_email_confirm']) {
           // @todo this should be set by the function that sends the mail after sending.
           $contributionParams['receipt_date'] = $changeDate;