From: Pradeep Nayak <pradpnayak@gmail.com>
Date: Thu, 29 Dec 2016 11:28:05 +0000 (+0530)
Subject: CRM-19585, fixed rebase error
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=225de6609bc19c4d9cedfc8e2812f5464387c51c;p=civicrm-core.git

CRM-19585, fixed rebase error

----------------------------------------
* CRM-19585: Sales tax issue
  https://issues.civicrm.org/jira/browse/CRM-19585
---

diff --git a/tests/phpunit/CRM/Contribute/BAO/ContributionTest.php b/tests/phpunit/CRM/Contribute/BAO/ContributionTest.php
index 6144348e84..54dc980092 100644
--- a/tests/phpunit/CRM/Contribute/BAO/ContributionTest.php
+++ b/tests/phpunit/CRM/Contribute/BAO/ContributionTest.php
@@ -938,7 +938,6 @@ WHERE eft.entity_id = %1 AND ft.to_financial_account_id <> %2";
   }
 
   /**
-<<<<<<< HEAD
    * Test calculateFinancialItemAmount().
    */
   public function testcalculateFinancialItemAmount() {