From f9a90b0b61a6aa01752bea77e271c54d0b05594e Mon Sep 17 00:00:00 2001
From: Alex Stratford <alexander3.stratford@live.uwe.ac.uk>
Date: Tue, 3 Dec 2019 20:53:14 +0000
Subject: [PATCH] A lot of merge issues

---
 examples/Makefile | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/examples/Makefile b/examples/Makefile
index 60f6274..1bf49b9 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -3,13 +3,8 @@ SRCDIR = ..
 # Test programs to compile, and a list of sources for each.
 # To add a new test, put its name on the PROGS list
 # and then add a name_SRC line that lists its source files.
-<<<<<<< HEAD
-PROGS = cat cmp cp echo halt hex-dump ls mcat mcp mkdir pwd rm shell \
-	bubsort insult lineup matmult recursor my touch
-=======
 PROGS = cat cmp cp echo exit halt hex-dump ls mcat mcp mkdir pwd rm shell \
 	bubsort insult lineup matmult recursor my
->>>>>>> Alex/exit-system-call
 
 # Should work from project 2 onward.
 cat_SRC = cat.c
-- 
GitLab