remove remaining line from merge conflict

2012-10-27 17:05:00 +02:00 · 2012-10-27 17:05:00 +02:00 · f151376ad5
parent 894d44e796
commit f151376ad5
1 changed files with 1 additions and 2 deletions
--- 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
+}