diff options
| author | Daan Leijen <daan@microsoft.com> | 2021-04-06 11:00:28 -0700 |
|---|---|---|
| committer | Daan Leijen <daan@microsoft.com> | 2021-04-06 11:00:28 -0700 |
| commit | c6f50922872deddd514a357853eec3dafb727fb2 (patch) | |
| tree | e33f59c4511804bdb812f85ae2387cc35f782857 /include/mimalloc.h | |
| parent | dc6bce256d4f3ce87761f9337977dff3d8b1776c (diff) | |
| parent | 985f313b35bc709aaa15d0f01867f857923c2ca6 (diff) | |
merge from dev
Diffstat (limited to 'include/mimalloc.h')
| -rw-r--r-- | include/mimalloc.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/mimalloc.h b/include/mimalloc.h index 2cdded9..988537c 100644 --- a/include/mimalloc.h +++ b/include/mimalloc.h @@ -8,7 +8,11 @@ terms of the MIT license. A copy of the license can be found in the file #ifndef MIMALLOC_H #define MIMALLOC_H +<<<<<<< HEAD #define MI_MALLOC_VERSION 201 // major + 2 digits minor +======= +#define MI_MALLOC_VERSION 171 // major + 2 digits minor +>>>>>>> dev // ------------------------------------------------------ // Compiler specific attributes |