remove remaining line from merge conflict

diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php
index 56664427fb83f2f03e28fe7306e97d0208524921..2f27cd0e667ae5f061a0c89a9c1741ab33864f33 100644 (file)
--- 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');\r
                return $view->deleteAll('', true);\r
        }\r
-}\r
->>>>>>> 12ea922... fix broken paths in versions app
+}