]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Bugfix: Fix an accidentally commited merge conflict
authorMatthias Maier <tamiko@kyomu.43-1.org>
Wed, 5 Dec 2012 14:12:46 +0000 (14:12 +0000)
committerMatthias Maier <tamiko@kyomu.43-1.org>
Wed, 5 Dec 2012 14:12:46 +0000 (14:12 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@27763 0785d39b-7218-0410-832d-ea1e28bc413d

tests/integrators/laplacian_01.cc

index 08170ff5c548aac823d5b332a1ab4513af203bc1..8632894875483ef408e31ffa7353bfad5e1f972a 100644 (file)
@@ -219,21 +219,12 @@ test(Triangulation<dim>& tr)
 {
   FE_DGQ<dim> q1(1);
   test_fe(tr, q1);
-<<<<<<< HEAD
-
-//  FE_DGQ<dim> q2(2);
-//  test_fe(tr, q2);
-
- FE_Nedelec<dim> n1(1);  
- test_fe(tr, n1);  
-=======
   
   FE_DGQ<dim> q2(2);
   test_fe(tr, q2);
   
   FE_Nedelec<dim> 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
 }

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.