GIT: Resolved conflict

This commit is contained in:
Andrew Heather
2015-12-09 09:32:38 +00:00
246 changed files with 4020 additions and 788 deletions

View File

@ -285,7 +285,8 @@ int main(int argc, char *argv[])
<< exit(FatalError);
}
Info<< nl << "end" << endl;
Info<< nl << "End" << nl << endl;
return 0;
}