From: bangerth Date: Tue, 30 Apr 2013 16:21:59 +0000 (+0000) Subject: Fix accidental checkin of merge conflict marker :-( X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec828b447dc76d84eafbb801c1093f6684326468;p=dealii-svn.git Fix accidental checkin of merge conflict marker :-( git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_4@29411 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/include/deal.II/lac/full_matrix.templates.h b/deal.II/include/deal.II/lac/full_matrix.templates.h index a0bbe2ef1f..39a2d461fc 100644 --- a/deal.II/include/deal.II/lac/full_matrix.templates.h +++ b/deal.II/include/deal.II/lac/full_matrix.templates.h @@ -744,27 +744,13 @@ void FullMatrix::mTmult (FullMatrix &dst, const size_type m = this->m(), n = src.m(), l = this->n(); -<<<<<<< .working - // arrange the loops in a way that - // we keep write operations low, - // (writing is usually more costly - // than reading). - for (size_type i=0; i::mTmult (FullMatrix &dst, else // arrange the loops in a way that we keep write operations low, (writing is // usually more costly than reading). - for (unsigned int i=0; i>>>>>> .merge-right.r29408 }