Skip to content
Snippets Groups Projects
Commit 5db9f70c authored by mattijs's avatar mattijs
Browse files

Merge branch 'merge-foundation' of...

Merge branch 'merge-foundation' of develop.openfoam.com:Development/OpenFOAM-plus into merge-foundation

Conflicts:
	src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
parents cba60be4 2025a2eb
Branches
Tags
1 merge request!60Merge foundation
Showing
with 37 additions and 26 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment