projects
/
occt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Correction of merge results
[occt.git]
/
src
/
Standard
/
Standard_DefineAlloc.hxx
diff --git
a/src/Standard/Standard_DefineAlloc.hxx
b/src/Standard/Standard_DefineAlloc.hxx
index
8d33bc3
..
eb5fdc2
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