diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2014-09-01 17:25:13 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2014-09-01 17:25:13 +0200 |
| commit | 8754341848b125b1f720b9b210875aa1543666d8 (patch) | |
| tree | 9f45e0e4c896224ec4f07b51bfbb954e66afd8c7 /unsupported/Eigen/MPRealSupport | |
| parent | daad9585a3635223b273cb45ba2a965d91060ff8 (diff) | |
Fix remaining garbage during a merge.
Diffstat (limited to 'unsupported/Eigen/MPRealSupport')
| -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())); |