Merge pull request #10377 from owncloud/git-fixes

fixes from git push force
2014-08-12 23:15:09 +02:00 · 2014-08-12 23:15:09 +02:00 · b4fd5fb275
parent c67fee3abd d4eaa74b76
commit b4fd5fb275
1 changed files with 0 additions and 2 deletions
--- a/apps/files_encryption/tests/util.php
+++ b/apps/files_encryption/tests/util.php
@ -472,8 +472,6 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {

 	}

-	/**
-
 	/**
 	 * @dataProvider dataProviderFortestIsMountPointApplicableToUser
 	 */