diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php
index 56664427fb..2f27cd0e66 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
+}