diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2012-10-27 17:05:00 +0200 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2012-10-27 17:06:13 +0200 |
| commit | f151376ad5beff46043645578add910b7e98a0f0 (patch) | |
| tree | bd9cbe63dbf63f72d6806d7881ee43bae8778e53 /apps | |
| parent | 894d44e796bf99882383fcee42f754c5d9d6828b (diff) | |
| download | nextcloud-server-f151376ad5beff46043645578add910b7e98a0f0.tar.gz nextcloud-server-f151376ad5beff46043645578add910b7e98a0f0.zip | |
remove remaining line from merge conflict
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files_versions/lib/versions.php | 3 |
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 +} |