remove remaining line from merge conflict
This commit is contained in:
parent
894d44e796
commit
f151376ad5
|
@ -275,5 +275,4 @@ class Storage {
|
||||||
$view = \OCP\Files::getStorage('files_versions');
|
$view = \OCP\Files::getStorage('files_versions');
|
||||||
return $view->deleteAll('', true);
|
return $view->deleteAll('', true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
>>>>>>> 12ea922... fix broken paths in versions app
|
|
||||||
|
|
Loading…
Reference in New Issue