resolved a merge conflict

cmake/modules/CMakeLists.txt

cmake/modules/CXXFeatures.cmake

cmake/modules/DuneMultimeshMacros.cmake

config.h.cmake

dune/multimesh/mmentity.hh

dune/multimesh/mmgeometry.hh

dune/multimesh/mmiterator.hh

dune/multimesh/multigridview.hh

dune/multimesh/multiindexset.hh

dune/multimesh/multimesh.hh

dune/multimesh/utility/structuredgridbuilder.hh

src/CMakeLists.txt

src/localrefinement.cc

src/multigridview.cc

src/testiterator.cc

src/uggrid.cc

test/CMakeLists.txt

test/testgridviews.cc

test/testvolume.cc