From 992808d07efab779da785fe0a40709f183cd5a0a Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 9 Oct 2015 19:52:37 -0400
Subject: [PATCH] CRM-17293 - Fix bad merge

---
 CRM/Core/Payment.php | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/CRM/Core/Payment.php b/CRM/Core/Payment.php
index 8bc65f8af2..3c8a67637c 100644
--- a/CRM/Core/Payment.php
+++ b/CRM/Core/Payment.php
@@ -113,18 +113,6 @@ abstract class CRM_Core_Payment {
     return FALSE;
   }
 
-  /**
-   * Opportunity for the payment processor to override the entire form build.
-   *
-   * @param CRM_Core_Form $form
-   *
-   * @return bool
-   *   Should form building stop at this point?
-   */
-  public function buildForm(&$form) {
-    return FALSE;
-  }
-
   /**
    * Log payment notification message to forensic system log.
    *
-- 
2.25.1