merge from dev-exp; resolve conflicts

2020-01-27 22:14:10 -08:00
parent b50bec463d
commit 09b98e0f7f
2 changed files with 0 additions and 8 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,10 +21,6 @@ set(mi_sources
    src/random.c
    src/os.c
    src/arena.c
-<<<<<<< HEAD
-=======
-    src/region.c
->>>>>>> dev-exp
    src/segment.c
    src/page.c
    src/alloc.c
--- a/src/static.c
+++ b/src/static.c
@@ -18,10 +18,6 @@ terms of the MIT license. A copy of the license can be found in the file
 #include "os.c"
 //#include "memory.c"
 #include "arena.c"
-<<<<<<< HEAD
-=======
-#include "region.c"
->>>>>>> dev-exp
 #include "segment.c"
 #include "page.c"
 #include "heap.c"