summaryrefslogtreecommitdiffstats
path: root/apps/files_sharing/lib
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2015-07-02 13:00:22 +0200
committerVincent Petry <pvince81@owncloud.com>2015-07-02 13:00:22 +0200
commitaedf4848f7100360d1f6695ebf23733e85b3a729 (patch)
tree0b80fd6bc3074fe6da93e3eb37ebe753483ea225 /apps/files_sharing/lib
parent73c20ec189b37ab668313511f1b7571ed15bf45e (diff)
parenta6ea91996c12199f5e90557fcca75fadd2fe4c6a (diff)
downloadnextcloud-server-aedf4848f7100360d1f6695ebf23733e85b3a729.tar.gz
nextcloud-server-aedf4848f7100360d1f6695ebf23733e85b3a729.zip
Merge pull request #17324 from owncloud/fix-duplicated-line-in-doc-block
Fix duplicated line in doc block
Diffstat (limited to 'apps/files_sharing/lib')
-rw-r--r--apps/files_sharing/lib/external/scanner.php1
1 files changed, 0 insertions, 1 deletions
diff --git a/apps/files_sharing/lib/external/scanner.php b/apps/files_sharing/lib/external/scanner.php
index 06708452c73..60eb7c8dacd 100644
--- a/apps/files_sharing/lib/external/scanner.php
+++ b/apps/files_sharing/lib/external/scanner.php
@@ -49,7 +49,6 @@ class Scanner extends \OC\Files\Cache\Scanner {
* @param int $parentId
* @param array | null $cacheData existing data in the cache for the file to be scanned
* @param bool $lock set to false to disable getting an additional read lock during scanning
- * @param array | null $cacheData existing data in the cache for the file to be scanned
* @return array an array of metadata of the scanned file
*/
public function scanFile($file, $reuseExisting = 0, $parentId = -1, $cacheData = null, $lock = true) {