fix corrupted merge.

dune/fem-dg/operator/adaptation/adaptation.cc

@@ -99,16 +99,6 @@ namespace Dune
   void
   AdaptationHandler< GridImp, FunctionSpace >::
   clearIndicator ()
-  {
-    indicator_.shrinkToFit();
-    indicator_.fill( LocalIndicatorData() );
-  }
-
-  //! add another adaptation handlers indicator container 
-  template <class GridImp, class FunctionSpace>
-  AdaptationHandler<GridImp, FunctionSpace>&   
-  AdaptationHandler<GridImp, FunctionSpace> ::  
-  operator += ( const ThisType& other ) 
   {
     indicator_.shrinkToFit();
     indicator_.fill( 0.0 );