From 09b98e0f7fee183df0e627ddcedcd9b870b156cf Mon Sep 17 00:00:00 2001
From: daan <daanl@outlook.com>
Date: Mon, 27 Jan 2020 22:14:10 -0800
Subject: [PATCH] merge from dev-exp; resolve conflicts

---
 CMakeLists.txt | 4 ----
 src/static.c   | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f332156d..ab3946ad 100644
--- 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
diff --git a/src/static.c b/src/static.c
index 302fa72e..b3c71e02 100644
--- 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"