aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2013-01-16 19:04:50 +0100
committerRobin Appelman <icewind@owncloud.com>2013-01-16 19:04:50 +0100
commit5445b94416f50bb040e7426cadfa458607893f07 (patch)
tree337b12362333030e0ebda37acb7f25073723a7af /tests
parent7debfac0dc8f602168d8db480cfd4757b4d612b0 (diff)
parent1d57a2e2a9d5e392bb1061479543cd1dec860c4b (diff)
downloadnextcloud-server-5445b94416f50bb040e7426cadfa458607893f07.tar.gz
nextcloud-server-5445b94416f50bb040e7426cadfa458607893f07.zip
merge master into filesystem
Diffstat (limited to 'tests')
-rw-r--r--tests/lib/files/storage/commontest.php2
-rw-r--r--tests/lib/files/storage/local.php1
2 files changed, 1 insertions, 2 deletions
diff --git a/tests/lib/files/storage/commontest.php b/tests/lib/files/storage/commontest.php
index 2e3808e2d92..744d4608420 100644
--- a/tests/lib/files/storage/commontest.php
+++ b/tests/lib/files/storage/commontest.php
@@ -39,5 +39,3 @@ class CommonTest extends Storage {
\OC_Helper::rmdirr($this->tmpDir);
}
}
-
-?>
diff --git a/tests/lib/files/storage/local.php b/tests/lib/files/storage/local.php
index 6672368e676..1aad138aa33 100644
--- a/tests/lib/files/storage/local.php
+++ b/tests/lib/files/storage/local.php
@@ -36,3 +36,4 @@ class Local extends Storage {
\OC_Helper::rmdirr($this->tmpDir);
}
}
+