diff options
| author | Daan <daanl@outlook.com> | 2022-02-14 16:44:33 -0800 |
|---|---|---|
| committer | Daan <daanl@outlook.com> | 2022-02-14 16:44:33 -0800 |
| commit | b89b4fd18a103eda7397cc7000b5ee5eda2f3cd8 (patch) | |
| tree | 37777e0816a79c876aa122ec11d6d5731e2dfd4d | |
| parent | 19edc880dae1cd51381a4e59aae74ffd59a108cc (diff) | |
fix v2.0.5 version
| -rw-r--r-- | cmake/mimalloc-config-version.cmake | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/cmake/mimalloc-config-version.cmake b/cmake/mimalloc-config-version.cmake index 76b2af6..acbd0f7 100644 --- a/cmake/mimalloc-config-version.cmake +++ b/cmake/mimalloc-config-version.cmake @@ -1,12 +1,6 @@ -<<<<<<< HEAD set(mi_version_major 2) set(mi_version_minor 0) -set(mi_version_patch 4) -======= -set(mi_version_major 1) -set(mi_version_minor 7) set(mi_version_patch 5) ->>>>>>> dev set(mi_version ${mi_version_major}.${mi_version_minor}) set(PACKAGE_VERSION ${mi_version}) |