]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Fix ommission.
authorwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 8 Apr 1999 15:49:21 +0000 (15:49 +0000)
committerwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 8 Apr 1999 15:49:21 +0000 (15:49 +0000)
git-svn-id: https://svn.dealii.org/trunk@1102 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/deal.II/source/multigrid/multigrid.cc
deal.II/deal.II/source/numerics/multigrid.cc

index 5d2a69805fbbefd147562bf453d5adcef2ae1a3a..0def1ffacaebc34d90e6a1d277327b1bcd796fa2 100644 (file)
@@ -82,7 +82,6 @@ MGTransferBase::~MGTransferBase ()
 /* ----------------------------- MGTransferPrebuilt ------------------------ */
 
 
-<<<<<<< multigrid.cc
 /*
 MGTransferPrebuilt::~MGTransferPrebuilt () 
 {};
index 5d2a69805fbbefd147562bf453d5adcef2ae1a3a..0def1ffacaebc34d90e6a1d277327b1bcd796fa2 100644 (file)
@@ -82,7 +82,6 @@ MGTransferBase::~MGTransferBase ()
 /* ----------------------------- MGTransferPrebuilt ------------------------ */
 
 
-<<<<<<< multigrid.cc
 /*
 MGTransferPrebuilt::~MGTransferPrebuilt () 
 {};

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.