Correction of merge results

diff --git a/src/NCollection/NCollection_DefineAlloc.hxx b/src/NCollection/NCollection_DefineAlloc.hxx
index 22488c8953540f2bf913452d83b1bab4c61b7c1d..2e8be06ebcf6c45d25f35cb3af7d70b8ad7a8ec1 100644 (file)
--- a/src/NCollection/NCollection_DefineAlloc.hxx
+++ b/src/NCollection/NCollection_DefineAlloc.hxx
@@ -30,4 +30,4 @@
    }
 # endif
 
-#endif
\ No newline at end of file
+#endif

diff --git a/src/Standard/Standard_DefineAlloc.hxx b/src/Standard/Standard_DefineAlloc.hxx
index 8d33bc377835b83242636e83fb7b789e08fcc1bd..eb5fdc2363164172731605948eee9dce40113aeb 100644 (file)
--- a/src/Standard/Standard_DefineAlloc.hxx
+++ b/src/Standard/Standard_DefineAlloc.hxx
@@ -66,4 +66,4 @@ inline void* operator new(size_t,void* anAddress)
 #endif
 #endif
 
-#endif
\ No newline at end of file
+#endif