From c6c922e44b753a54c3bc5663c3667f11684a544f Mon Sep 17 00:00:00 2001 From: maier Date: Wed, 5 Dec 2012 14:12:46 +0000 Subject: [PATCH] Bugfix: Fix an accidentally commited merge conflict git-svn-id: https://svn.dealii.org/branches/branch_cmake@27763 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/integrators/laplacian_01.cc | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/tests/integrators/laplacian_01.cc b/tests/integrators/laplacian_01.cc index 08170ff5c5..8632894875 100644 --- a/tests/integrators/laplacian_01.cc +++ b/tests/integrators/laplacian_01.cc @@ -219,21 +219,12 @@ test(Triangulation& tr) { FE_DGQ q1(1); test_fe(tr, q1); -<<<<<<< HEAD - -// FE_DGQ q2(2); -// test_fe(tr, q2); - - FE_Nedelec n1(1); - test_fe(tr, n1); -======= FE_DGQ q2(2); test_fe(tr, q2); FE_Nedelec n1(1); test_fe(tr, n1); ->>>>>>> trunk } @@ -249,14 +240,7 @@ int main() TestGrids::hypercube(tr2, 1); test(tr2); -<<<<<<< HEAD -// Triangulation<3> tr3; -// TestGrids::hypercube(tr3, 1); -// test(tr3); - -======= Triangulation<3> tr3; TestGrids::hypercube(tr3, 1); test(tr3); ->>>>>>> trunk } -- 2.39.5