Merge pull request #7383 from thehereward/tidy-up-remove-unnecessary-imports

author Tim Otten <totten@civicrm.org>

Tue, 22 Dec 2015 02:43:39 +0000 (18:43 -0800)

committer Tim Otten <totten@civicrm.org>

Tue, 22 Dec 2015 02:43:39 +0000 (18:43 -0800)
author Tim Otten <totten@civicrm.org>
Tue, 22 Dec 2015 02:43:39 +0000 (18:43 -0800)
committer Tim Otten <totten@civicrm.org>
Tue, 22 Dec 2015 02:43:39 +0000 (18:43 -0800)
diff --cc CRM/Core/Payment.php

index 77bbeaf93b2ab5da84af9f061369b54ab6df798c,3907f6a83306cc99c2690bce6c3fdc3b528119cd..f8964c52a64dc2edcde1655b1ab07528c97944c6

mode 100644,100755..100755
--- 1/CRM/Core/Payment.php
--- 2/CRM/Core/Payment.php
+++ b/CRM/Core/Payment.php
diff --cc tests/phpunit/CiviTest/CiviUnitTestCase.php
Simple merge
author	Tim Otten <totten@civicrm.org>
	Tue, 22 Dec 2015 02:43:39 +0000 (18:43 -0800)
committer	Tim Otten <totten@civicrm.org>
	Tue, 22 Dec 2015 02:43:39 +0000 (18:43 -0800)
		1	2
CRM/Core/Payment.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/phpunit/CiviTest/CiviUnitTestCase.php	patch \|	diff1 \|	diff2 \|	blob \| history