[Pkg-owncloud-commits] [owncloud] 58/75: forgot to resolve conflict resulting from cherry picking 71e71b75eeb7ac0719df149ecb2b34d3312b2490

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag v3.0.1
in repository owncloud.

commit 01dfc2e83622762654c9f45525b983db22a79434
Author: Arthur Schiwon <blizzz at owncloud.com>
Date:   Mon Mar 12 17:21:39 2012 +0100

    forgot to resolve conflict resulting from cherry picking 71e71b75eeb7ac0719df149ecb2b34d3312b2490
---
 lib/filestorage/local.php |    3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php
index 3c96ff6..a94098b 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);
 	}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git