.idea/vcs.xml

@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="GitSharedSettings">
-    <option name="FORCE_PUSH_PROHIBITED_PATTERNS">
-      <list />
-    </option>
-  </component>
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
   </component>

main.c

@@ -1,19 +1,11 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <unistd.h>
-<<<<<<< HEAD
 #include <stdlib.h>
-=======
-#include <sys/syscall.h>
->>>>>>> origin/main
 
 #define ALIGN16(s) (((s) + 15) & ~0x0F)
 #define BLOCK_SIZE sizeof(struct block)
-<<<<<<< HEAD
 #define MINIMUM_BLOCK_SIZE (sizeof(struct block) + 16)
-=======
-#define MINIMUM_BLOCK_SIZE  4
->>>>>>> origin/main
 
 /// The memory block's header.
 struct block
@@ -36,18 +28,12 @@ struct block *extend_heap(size_t s)
 	if (s < MINIMUM_BLOCK_SIZE)
 		s = MINIMUM_BLOCK_SIZE;
 
-<<<<<<< HEAD
 	struct block *b = (struct block *)sbrk(0); // Get the current break
 
 	// Add the size of the block header to the requested size
 	s += BLOCK_SIZE;
 
 	if (sbrk(s) == (void *)-1) // Extend the break by s bytes
-=======
-	struct block* b = (struct block*)syscall(SYS_brk, NULL);
-
-	if ((void*)syscall(SYS_brk, (char*)(b + 1) + s) == (void*)-1)
->>>>>>> origin/main
 		return NULL;
 
 	b->size = s;
@@ -283,7 +269,6 @@ int main()
 
 	printf("Test 1: %i\n", *a);
 	printf("Test 2: %i\n", *b);
-	printf("Heap Size: %zu Bytes\n", get_heap_size());
 
 	free(a);
 	free(b);