From 8754341848b125b1f720b9b210875aa1543666d8 Mon Sep 17 00:00:00 2001
From: Gael Guennebaud <g.gael@free.fr>
Date: Mon, 1 Sep 2014 17:25:13 +0200
Subject: Fix remaining garbage during a merge.

---
 unsupported/Eigen/MPRealSupport | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'unsupported/Eigen/MPRealSupport')

diff --git a/unsupported/Eigen/MPRealSupport b/unsupported/Eigen/MPRealSupport
index 630e0aa77..8e42965a3 100644
--- a/unsupported/Eigen/MPRealSupport
+++ b/unsupported/Eigen/MPRealSupport
@@ -159,11 +159,7 @@ int main()
       {
         if(rows==0 || cols==0 || depth==0)
           return;
-<<<<<<< local
 
-=======
-        
->>>>>>> other
         mpreal  acc1(0,mpfr_get_prec(blockA[0].mpfr_srcptr())),
                 tmp (0,mpfr_get_prec(blockA[0].mpfr_srcptr()));
 
-- 
cgit v1.2.3