Merge branch 'cleanup/remove_multiple_include' into 'master'

Remove double include of subcontrolvolumeface.hh.

See merge request !1409

dumux/discretization/staggered/freeflow/fvgridgeometrytraits.hh

@@ -28,7 +28,6 @@
 #include <dumux/common/intersectionmapper.hh>
 #include <dumux/discretization/cellcentered/subcontrolvolume.hh>
 #include <dumux/discretization/staggered/fvelementgeometry.hh>
-#include <dumux/discretization/staggered/freeflow/subcontrolvolumeface.hh>
 
 #include "subcontrolvolumeface.hh"
 #include "connectivitymap.hh"