resolved merge conflict

Author: pranav-bhatt

src/safeposix/syscalls/fs_calls.rs

@@ -1315,11 +1315,8 @@ impl Cage {
     ///
     /// ### Panics
     ///
-<<<<<<< HEAD
     /// * If the file descriptor passed is invalid (less than zero or greater
     ///   than MAX FD which is 1024)
-=======
->>>>>>> baf10435 (fstat_syscall documentation)
     /// * If the inode number retrieved from the file descriptor does not exist
     ///   in `FS_METADATA.inodetable`.
     ///