mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
Conflicts: src/lagrangian/intermediate/parcels/Templates/KinematicParcel/CollisionRecordList/CollisionRecordList.H src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/NoCollision/NoCollision.H src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/receivingReferralList.C src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/sendingReferralList.C