Conflicts: applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/createShellMesh.C applications/utilities/surface/surfaceCheck/surfaceCheck.C src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.C NOTE: also needed to strip trailing space/lines in various files |
||
---|---|---|
.. | ||
Make | ||
calculateFields.H | ||
channelIndex.C | ||
channelIndex.H | ||
channelIndexTemplates.C | ||
collapse.H | ||
postChannel.C | ||
postChannelDict | ||
readFields.H | ||
readTransportProperties.H |