1
0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00

Correction of merge results

This commit is contained in:
bugmaster 2012-03-07 13:31:49 +04:00
parent 65c62757a4
commit e2e80ff797
2 changed files with 2 additions and 2 deletions

View File

@ -30,4 +30,4 @@
}
# endif
#endif
#endif

View File

@ -66,4 +66,4 @@ inline void* operator new(size_t,void* anAddress)
#endif
#endif
#endif
#endif