From aa8694283672ed6493cde75e91296db6ac47c178 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 13 Jan 2015 20:25:45 -0500
Subject: [PATCH] CRM-15817 - Fix merge error

---
 CRM/Core/Payment/BaseIPN.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CRM/Core/Payment/BaseIPN.php b/CRM/Core/Payment/BaseIPN.php
index 3034ab939a..6aa92b45f1 100644
--- a/CRM/Core/Payment/BaseIPN.php
+++ b/CRM/Core/Payment/BaseIPN.php
@@ -596,7 +596,7 @@ LIMIT 1;";
     if ($contribution->id) {
       $contributionStatuses = CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'name');
       if ((empty($input['prevContribution']) && $paymentProcessorId) || (!$input['prevContribution']->is_pay_later &&
--      $input['prevContribution']->contribution_status_id == array_search('Pending', $contributionStatuses))) {
+       $input['prevContribution']->contribution_status_id == array_search('Pending', $contributionStatuses))) {
        $input['payment_processor'] = $paymentProcessorId;
       }
       $input['contribution_status_id'] = array_search('Completed', $contributionStatuses);
-- 
2.25.1