From: Matthias Maier Date: Tue, 25 Sep 2012 22:19:39 +0000 (+0000) Subject: Fix accidentally commited merge conflict X-Git-Tag: v8.0.0~1079^2~643 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=664107b4545f67e88482d9bae7bc723c26c1c3c4;p=dealii.git Fix accidentally commited merge conflict git-svn-id: https://svn.dealii.org/branches/branch_cmake@26741 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/include/deal.II/integrators/laplace.h b/deal.II/include/deal.II/integrators/laplace.h index abde390234..b6fae6900d 100644 --- a/deal.II/include/deal.II/integrators/laplace.h +++ b/deal.II/include/deal.II/integrators/laplace.h @@ -121,20 +121,12 @@ namespace LocalIntegrators AssertVectorVectorDimension(input, n_comp, fe.n_quadrature_points); Assert(result.size() == n_dofs, ExcDimensionMismatch(result.size(), n_dofs)); -<<<<<<< HEAD - for (unsigned k=0;k>>>>>> trunk for (unsigned int d=0;d