From 44fd908483cc788a78f35d4d8a9e1cbdd7cac34d Mon Sep 17 00:00:00 2001
From: joannechester <j_chester@optusnet.com.au>
Date: Sun, 16 Aug 2015 16:50:19 +1000
Subject: [PATCH] reverting-conflict

---
 CRM/Contribute/BAO/Contribution.php | 1 -
 1 file changed, 1 deletion(-)

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;
-- 
2.25.1