Remove old merge conflict comments

diff --git a/CRM/Report/Form/Contribute/Summary.php b/CRM/Report/Form/Contribute/Summary.php
index 25aaf152331c57248dd520c8734bdeeeabe38a3d..f385e6e2a08d4a9f657f55dd23e2a8772ed8692a 100644 (file)
--- a/CRM/Report/Form/Contribute/Summary.php
+++ b/CRM/Report/Form/Contribute/Summary.php
@@ -44,7 +44,6 @@ class CRM_Report_Form_Contribute_Summary extends CRM_Report_Form {
   public $_drilldownReport = array('contribute/detail' => 'Link to Detail Report');
 
   /**
-<<<<<<< HEAD
    * To what frequency group-by a date column
    *
    * @var array
@@ -58,9 +57,7 @@ class CRM_Report_Form_Contribute_Summary extends CRM_Report_Form {
   );
 
   /**
-=======
    * Class constructor.
->>>>>>> upstream/4.6
    */
   public function __construct() {