GIT: Resolved conflict

applications/test/parallel/Test-parallel.C

...utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict

...essing/dataConversion/foamToEnsight/ensightBinaryStream.H

...ics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamVolFields.H

...tions/utilities/postProcessing/sampling/sample/sampleDict

...cations/utilities/surface/surfaceInflate/surfaceInflate.C

bin/tools/RunFunctions

etc/bashrc

src/Allwmake

src/OpenFOAM/db/IOstreams/IOstreams/Ostream.C

src/OpenFOAM/db/IOstreams/IOstreams/Ostream.H

src/OpenFOAM/db/IOstreams/Pstreams/UOPstream.C

src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C

src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H

src/OpenFOAM/db/IOstreams/Pstreams/exchange.C

src/OpenFOAM/db/dictionary/dictionaryIO.C

...b/functionObjects/functionObjectFile/functionObjectFile.C

...s/GeometricFields/GeometricField/GeometricBoundaryField.C

src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C

...nFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C