Fix conflicts

Signed-off-by: Ian Moffett <ian@osmora.org>

1 files changed, 11 insertions, 0 deletions

diff --git a/src/sys/include/os/filedesc.h b/src/sys/include/os/filedesc.h
index 87bf242..c339ed6 100644
--- a/src/sys/include/os/filedesc.h
+++ b/src/sys/include/os/filedesc.h
@@ -60,6 +60,17 @@ struct filedesc {
 int fdtab_init(struct proc *procp);
 
 /*
+ * Open a file
+ *
+ * @path: Path to file in which we wish to open
+ * @mode: Mode of our desired file
+ *
+ * Returns the file descriptor on success,
+ * otherwise a less than zero value on failure.
+ */
+int fd_open(const char *path, mode_t mode);
+
+/*
  * Write to a file descriptor
  *
  * @fd: File descriptor to write to