From dc64f53924173578c65bac3c9b086dc22c4b08dc Mon Sep 17 00:00:00 2001
From: Andrew Heather <a.heather@opencfd.co.uk>
Date: Wed, 9 Dec 2015 10:20:10 +0000
Subject: [PATCH] GIT: remove remnants of conflict
---
.../utilities/mesh/manipulation/renumberMesh/renumberMesh.C | 2 --
1 file changed, 2 deletions(-)
diff --git a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
index 7fcfa3b59b5..d9fd1daa6b7 100644
--- a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
+++ b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
@@ -924,8 +924,6 @@ int main(int argc, char *argv[])
}
->>>>>>> develop
-
Info<< endl;
// From renumbering:
--
GitLab