diff options
Diffstat (limited to 'lib/filestorage/local.php')
| -rw-r--r-- | lib/filestorage/local.php | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php index 3c96ff64f37..a94098bb7c1 100644 --- a/lib/filestorage/local.php +++ b/lib/filestorage/local.php @@ -67,11 +67,9 @@ class OC_Filestorage_Local extends OC_Filestorage{ public function filemtime($path){ return filemtime($this->datadir.$path); } -<<<<<<< HEAD public function fileatime($path){ return fileatime($this->datadir.$path); } -======= public function setFileMtime($path, $mtime){ // sets the modification time of the file to the given value. If mtime is nil the current time is set. @@ -79,7 +77,6 @@ class OC_Filestorage_Local extends OC_Filestorage{ return touch($this->datadir.$path, $mtime); } ->>>>>>> 85853f9... - Added the ability to change a files mtime via webdavs propset. public function file_get_contents($path){ return file_get_contents($this->datadir.$path); } |