From 34ba03951e0756ad1c95c2dd01e967ed8a3f5745 Mon Sep 17 00:00:00 2001 From: Daan Leijen Date: Tue, 6 Apr 2021 11:01:06 -0700 Subject: [PATCH] merge from dev --- include/mimalloc.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/include/mimalloc.h b/include/mimalloc.h index 988537c5..2cdded9f 100644 --- a/include/mimalloc.h +++ b/include/mimalloc.h @@ -8,11 +8,7 @@ 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