From 38a454f63465b5f35a4eb3f3b779b29eb865520b Mon Sep 17 00:00:00 2001
From: JKingsnorth <john@johnkingsnorth.co.uk>
Date: Mon, 2 Nov 2015 15:10:04 +0000
Subject: [PATCH] Remove old merge conflict comments

---
 CRM/Report/Form/Contribute/Summary.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/CRM/Report/Form/Contribute/Summary.php b/CRM/Report/Form/Contribute/Summary.php
index 25aaf15233..f385e6e2a0 100644
--- 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() {
 
-- 
2.25.1