GIT: Resolve conflict when applying Sergio's updates to new local branch

src/thermophysicalModels/radiation/Make/files

...boundaryRadiationProperties/boundaryRadiationProperties.C

...boundaryRadiationProperties/boundaryRadiationProperties.H

...aryRadiationProperties/boundaryRadiationPropertiesPatch.C

...aryRadiationProperties/boundaryRadiationPropertiesPatch.H

...aterSuppressionPanel/constant/boundaryRadiationProperties

...ppositeBurningPanels/constant/boundaryRadiationProperties

.../les/smallPoolFire2D/constant/boundaryRadiationProperties

tutorials/combustion/fireFoam/les/smallPoolFire3D/Allrun

.../les/smallPoolFire3D/constant/boundaryRadiationProperties

...oam/hotRadiationRoom/constant/boundaryRadiationProperties

...otRadiationRoomFvDOM/constant/boundaryRadiationProperties

...xternalSolarLoad/constant/air/boundaryRadiationProperties

...rRadiation/constant/bottomAir/boundaryRadiationProperties

...aterRadiation/constant/topAir/boundaryRadiationProperties

...Foam/simplifiedSiwek/constant/boundaryRadiationProperties