diff options
-rw-r--r-- | unsupported/Eigen/MPRealSupport | 4 |
1 files changed, 0 insertions, 4 deletions
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())); |