Correction of merge results
authorbugmaster <bugmaster@opencascade.com>
Wed, 7 Mar 2012 09:31:49 +0000 (13:31 +0400)
committerbugmaster <bugmaster@opencascade.com>
Wed, 7 Mar 2012 09:31:49 +0000 (13:31 +0400)
src/NCollection/NCollection_DefineAlloc.hxx
src/Standard/Standard_DefineAlloc.hxx

index 8d33bc3..eb5fdc2 100644 (file)
@@ -66,4 +66,4 @@ inline void* operator new(size_t,void* anAddress)
 #endif
 #endif
 
-#endif
\ No newline at end of file
+#endif