mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
GIT: remove remnants of conflict
This commit is contained in:
@ -924,8 +924,6 @@ int main(int argc, char *argv[])
|
||||
}
|
||||
|
||||
|
||||
>>>>>>> develop
|
||||
|
||||
Info<< endl;
|
||||
|
||||
// From renumbering:
|
||||
|
||||
Reference in New Issue
Block a user