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

@ -61,7 +61,7 @@ int main(int argc, char *argv[])
const fileName importName = args[1];
const fileName exportName = args[2];
// disable inplace editing
// Disable inplace editing
if (importName == exportName)
{
FatalErrorInFunction
@ -69,7 +69,7 @@ int main(int argc, char *argv[])
<< exit(FatalError);
}
// check that reading/writing is supported
// Check that reading/writing is supported
if
(
!edgeMesh::canReadType(importName.ext(), true)