merged origin/develop

dune/amdis/utility/TreePath.hpp

@@ -97,19 +97,7 @@ namespace AMDiS
     return Dune::TypeTree::hybridTreePath();
   }
 
-<<<<<<< HEAD
-  template <class... T>
-  auto makeDynamicTreePath(Dune::TypeTree::HybridTreePath<T...> const& tp)
-  {
-    auto tmp = Dune::TypeTree::MakeableDynamicTreePath<sizeof...(T)>().mutablePath();
-    forEach(range_<0,sizeof...(T)>, [&tp,&tmp](auto _i) mutable {
-      tmp.push_back(std::size_t(std::get<_i>(tp._data)));
-    });
-    return tmp.view();
-  }
-=======
 #endif // DOXYGEN
->>>>>>> 076a7e1479a879871f8599eade9f911c41ca09a8
 
 
   namespace Impl