summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2014-08-12 23:15:09 +0200
committerMorris Jobke <hey@morrisjobke.de>2014-08-12 23:15:09 +0200
commitb4fd5fb275f0946a1aa0a598ee74e54256cbaf6c (patch)
tree78ef1ef9996169ea9cf7794d95127f64a625f974
parentc67fee3abd4dc05b6adfef3f527b76368e568dd5 (diff)
parentd4eaa74b763d9d3734ff9d3873bc3f91f46158d3 (diff)
downloadnextcloud-server-b4fd5fb275f0946a1aa0a598ee74e54256cbaf6c.tar.gz
nextcloud-server-b4fd5fb275f0946a1aa0a598ee74e54256cbaf6c.zip
Merge pull request #10377 from owncloud/git-fixes
fixes from git push force
-rwxr-xr-xapps/files_encryption/tests/util.php2
1 files changed, 0 insertions, 2 deletions
diff --git a/apps/files_encryption/tests/util.php b/apps/files_encryption/tests/util.php
index cbc4df92474..ae93e87d013 100755
--- a/apps/files_encryption/tests/util.php
+++ b/apps/files_encryption/tests/util.php
@@ -473,8 +473,6 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
}
/**
-
- /**
* @dataProvider dataProviderFortestIsMountPointApplicableToUser
*/
function testIsMountPointApplicableToUser($mount, $expectedResult) {