GIT: resolve conflict

This commit is contained in:
andy
2014-01-14 12:55:56 +00:00
4 changed files with 4 additions and 4 deletions

View File

@ -626,7 +626,7 @@ void Foam::streamLine::write()
}
Info<< " Tracks:" << allTracks_.size() << nl
<< " Tottal samples:" << n
<< " Total samples:" << n
<< endl;