From b54e3267b476e1d01db1778a9c6dabfa1bd44acb Mon Sep 17 00:00:00 2001
From: Alex Stratford <alexander3.stratford@live.uwe.ac.uk>
Date: Wed, 4 Dec 2019 10:32:14 +0000
Subject: [PATCH] Fixed merge error

---
 userprog/system_calls.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/userprog/system_calls.h b/userprog/system_calls.h
index f850b7e..7d74bc4 100644
--- a/userprog/system_calls.h
+++ b/userprog/system_calls.h
@@ -38,6 +38,8 @@ void syscall_wait(struct intr_frame *f);
  * "file descriptor" (fd), or -1 if the file could not be opened.
  */
 void syscall_open(struct intr_frame *f);
+
+/*
  * Creates a new file called file initially initial_size bytes in size.
  * Returns true if successful, false otherwise.
  */
-- 
GitLab