Remove stray merge msg

diff --git a/CRM/Core/Payment/Form.php b/CRM/Core/Payment/Form.php
index addc8287b1a9e478586e34d08e429689a2d24c1a..6ece599a74700549d46b1901fad253f5c22413a1 100644 (file)
--- 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
    *