diff options
| author | Robin Appelman <icewind@owncloud.com> | 2015-04-20 16:59:20 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2015-04-27 14:07:16 +0200 |
| commit | dd9601ae8fd0f50eb87d2ce3eed6c5f845573987 (patch) | |
| tree | e1766cd4143dc99316f6e17b730565efc82f4b28 /apps/files_sharing/tests | |
| parent | 45784f213f5e7cf9a38feabd52c4ffadee9ae4f9 (diff) | |
| download | nextcloud-server-dd9601ae8fd0f50eb87d2ce3eed6c5f845573987.tar.gz nextcloud-server-dd9601ae8fd0f50eb87d2ce3eed6c5f845573987.zip | |
fix merge
Diffstat (limited to 'apps/files_sharing/tests')
| -rw-r--r-- | apps/files_sharing/tests/controller/sharecontroller.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files_sharing/tests/controller/sharecontroller.php b/apps/files_sharing/tests/controller/sharecontroller.php index c3bd41b0402..64ee5b8ce51 100644 --- a/apps/files_sharing/tests/controller/sharecontroller.php +++ b/apps/files_sharing/tests/controller/sharecontroller.php @@ -26,7 +26,7 @@ namespace OCA\Files_Sharing\Controllers; use OC\Files\Filesystem; -use OCA\Files_Sharing\Application; +use OCA\Files_Sharing\AppInfo\Application; use OCP\AppFramework\Http\NotFoundResponse; use OCP\AppFramework\IAppContainer; use OCP\Files; |