From 1a6e80192225f58b550703e69ba4bf1e14ce0923 Mon Sep 17 00:00:00 2001
From: Bess <bakere1@student.unimelb.edu.au>
Date: Sun, 28 Mar 2021 19:22:29 +1100
Subject: [PATCH] buffProc -not for task4 test 2

---
 allocate.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/allocate.c b/allocate.c
index 2a4fbcf..d16d580 100644
--- a/allocate.c
+++ b/allocate.c
@@ -1,7 +1,7 @@
 /*
  * this is allocate.c
  */
-
+ this is a confilict
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-- 
GitLab