From 204a1cc2b01ed3f18cb3e33bd6aa756d1f99dda8 Mon Sep 17 00:00:00 2001
From: dec05eba <dec05eba@protonmail.com>
Date: Sun, 24 Feb 2019 18:29:26 +0100
Subject: Fix rebase error

---
 src/scoped_allocator.c | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'src/scoped_allocator.c')

diff --git a/src/scoped_allocator.c b/src/scoped_allocator.c
index bd14206..cbf1aad 100644
--- a/src/scoped_allocator.c
+++ b/src/scoped_allocator.c
@@ -2,11 +2,7 @@
 #include "../include/alloc.h"
 #include <assert.h>
 
-<<<<<<< HEAD
-#define ALLOC_NODE_SIZE 4096
-=======
 #define ALLOC_NODE_SIZE 65536
->>>>>>> Fixed CHECK_RESULT macro, use scoped allocator
 
 int scoped_allocator_node_init(ScopedAllocatorNode *self) {
     self->data = NULL;
-- 
cgit v1.2.3