diff options
author | Morris Jobke <hey@morrisjobke.de> | 2014-08-12 23:15:09 +0200 |
---|---|---|
committer | Morris Jobke <hey@morrisjobke.de> | 2014-08-12 23:15:09 +0200 |
commit | b4fd5fb275f0946a1aa0a598ee74e54256cbaf6c (patch) | |
tree | 78ef1ef9996169ea9cf7794d95127f64a625f974 | |
parent | c67fee3abd4dc05b6adfef3f527b76368e568dd5 (diff) | |
parent | d4eaa74b763d9d3734ff9d3873bc3f91f46158d3 (diff) | |
download | nextcloud-server-b4fd5fb275f0946a1aa0a598ee74e54256cbaf6c.tar.gz nextcloud-server-b4fd5fb275f0946a1aa0a598ee74e54256cbaf6c.zip |
Merge pull request #10377 from owncloud/git-fixes
fixes from git push force
-rwxr-xr-x | apps/files_encryption/tests/util.php | 2 |
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) { |