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