Conflicts:
	examples/advection/LaxFridrichs.h
	examples/advection/LaxFridrichs_impl.h
	examples/advection/advection.h
	examples/advection/advectionBuildConfigTag.h
	examples/advection/advectionProblem_impl.h
	examples/advection/advectionRhs.h
	examples/inviscid-flow/1d/EulerPressureGetter.h
	examples/inviscid-flow/1d/EulerVelGetter.h
	examples/inviscid-flow/1d/LaxFridrichsContinuity.h
	examples/inviscid-flow/1d/LaxFridrichsContinuity_impl.h
	examples/inviscid-flow/1d/LaxFridrichsEnergy.h
	examples/inviscid-flow/1d/LaxFridrichsEnergy_impl.h
	examples/inviscid-flow/1d/LaxFridrichsMomentum.h
	examples/inviscid-flow/1d/LaxFridrichsMomentum_impl.h
	examples/inviscid-flow/1d/eulerProblem_impl.h
	examples/inviscid-flow/2d/EulerPressureGetter.h
	examples/inviscid-flow/2d/EulerPressureGetter_impl.h
	examples/inviscid-flow/2d/EulerVelGetter.h
	examples/inviscid-flow/2d/EulerVelGetter_impl.h
	examples/inviscid-flow/2d/EulerVelXGetter.h
	examples/inviscid-flow/2d/EulerVelXGetter_impl.h
	examples/inviscid-flow/2d/EulerVelYGetter.h
	examples/inviscid-flow/2d/EulerVelYGetter_impl.h
	examples/inviscid-flow/2d/LaxFridrichsContinuity.h
	examples/inviscid-flow/2d/LaxFridrichsContinuity_impl .h
	examples/inviscid-flow/2d/LaxFridrichsEnergy.h
	examples/inviscid-flow/2d/LaxFridrichsEnergy_impl.h
	examples/inviscid-flow/2d/LaxFridrichsMomentumX.h
	examples/inviscid-flow/2d/LaxFridrichsMomentumX_impl.h
	examples/inviscid-flow/2d/LaxFridrichsMomentumY.h
	examples/inviscid-flow/2d/LaxFridrichsMomentumY_impl.h
	examples/inviscid-flow/2d/euler.h
	examples/inviscid-flow/2d/eulerBuildConfigTag.h
	examples/inviscid-flow/2d/eulerRhs.h
	examples/inviscid-flow/eulerBuildConfigTag.h
	examples/inviscid-flow/eulerProblem_impl.h
	src/TNL/Functions/MeshFunction_impl.h
	src/TNL/Functions/OperatorFunction.h
	src/TNL/Functions/TestFunction.h
	src/TNL/Functions/TestFunction_impl.h
	src/Tools/tnl-view.h
	tests/benchmarks/heat-equation-benchmark/tnlTestGrid2D.h
	tests/benchmarks/heat-equation-benchmark/tnlTestGridEntity.h