fix: split layout of conflict view#3951

Merged

mejo- merged 3 commits intomainfrom

fix/conflict-layout

Mar 17, 2023

Commits on Mar 16, 2023

fix: split layout of conflict view

max-nextcloud
authored and
mejo-
committed
fix: run all the sync tests again

max-nextcloud
authored and
mejo-
committed
Compile assets
nextcloud-command
committed