# Conflicts:
#	.travis.yml
#	dune.module
#	dune/xt/grid/grids.hh
#	dune/xt/grid/type_traits.hh
#	dune/xt/grid/walker.hh