From fb9b6238108cbeab42cd07fe7f55787165909249 Mon Sep 17 00:00:00 2001 From: colemanw Date: Thu, 16 Jul 2015 14:20:12 -0400 Subject: [PATCH] Remove stray merge msg --- CRM/Core/Payment/Form.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/CRM/Core/Payment/Form.php b/CRM/Core/Payment/Form.php index addc8287b1..6ece599a74 100644 --- a/CRM/Core/Payment/Form.php +++ b/CRM/Core/Payment/Form.php @@ -299,8 +299,6 @@ class CRM_Core_Payment_Form { } /** -<<<<<<< HEAD -======= * Billing mode button is basically synonymous with paypal express - this is probably a good example of 'odds & sods' code we * need to find a way for the payment processor to assign. A tricky aspect is that the payment processor may need to set the order * -- 2.25.1