jupyter

2018-02-25 00:29:08 +00:00
parent a073b663ae
commit 530246688c
11 changed files with 91 additions and 66 deletions
--- a/os/files.c
+++ b/os/files.c
@@ -429,11 +429,7 @@ static Int access_file(USES_REGS1) {
                return FALSE;
            }
        } else {
-<<<<<<< HEAD
-	  return true;
-=======
            return false;
->>>>>>> f798372fb1dc4ff03c592d2ae8e0245a842305b8
        }
    }
 #if HAVE_ACCESS