From e2e80ff797c1141f5bc902d442727871090c173c Mon Sep 17 00:00:00 2001
From: bugmaster <bugmaster@opencascade.com>
Date: Wed, 7 Mar 2012 13:31:49 +0400
Subject: [PATCH] Correction of merge results

---
 src/NCollection/NCollection_DefineAlloc.hxx | 2 +-
 src/Standard/Standard_DefineAlloc.hxx       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/NCollection/NCollection_DefineAlloc.hxx b/src/NCollection/NCollection_DefineAlloc.hxx
index 22488c8953..2e8be06ebc 100644
--- 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 8d33bc3778..eb5fdc2363 100644
--- 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