From 0a4ef874dee6ea3f219560be43e8afc92a530332 Mon Sep 17 00:00:00 2001 From: maier Date: Tue, 25 Sep 2012 22:19:39 +0000 Subject: [PATCH] Fix accidentally commited merge conflict git-svn-id: https://svn.dealii.org/branches/branch_cmake@26741 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/include/deal.II/integrators/laplace.h | 8 -------- 1 file changed, 8 deletions(-) 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