summaryrefslogtreecommitdiffstats
path: root/apps/files_versions/lib/versions.php
diff options
context:
space:
mode:
Diffstat (limited to 'apps/files_versions/lib/versions.php')
-rw-r--r--apps/files_versions/lib/versions.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php
index 56664427fb8..2f27cd0e667 100644
--- a/apps/files_versions/lib/versions.php
+++ b/apps/files_versions/lib/versions.php
@@ -275,5 +275,4 @@ class Storage {
$view = \OCP\Files::getStorage('files_versions');
return $view->deleteAll('', true);
}
-}
->>>>>>> 12ea922... fix broken paths in versions app
+}