zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GIT: Resolved conflict

Browse Source
This commit is contained in:
Andrew Heather
2015-12-09 16:19:28 +00:00
parent abeef3313d ed2db73e50
commit 5c9dff6146
2311 changed files with 44971 additions and 26546 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C
View File

@ -98,7 +98,7 @@ int main(int argc, char *argv[])
if (collapseFaces && collapseFaceSet)
{
FatalErrorIn("main(int, char*[])")
FatalErrorInFunction
<< "Both face zone collapsing and face collapsing have been"
<< "selected. Choose only one of:" << nl
<< " -collapseFaces" << nl