From: Björn Schießle Date: Sat, 27 Oct 2012 15:05:00 +0000 (+0200) Subject: remove remaining line from merge conflict X-Git-Tag: v5.0.0alpha1~593 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f151376ad5beff46043645578add910b7e98a0f0;p=nextcloud-server.git remove remaining line from merge conflict --- 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 +}