[Owncloud] Official way of dealing with conflict files.

[Norman Rieß]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi,

a fair amount of conflict files have errupted lately in my sync folders.
What is the official and less destructive way to deal with them?

Regards,
Norman
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://www.enigmail.net/

iQEcBAEBAgAGBQJQjmpLAAoJEMCA6frkLT6zQ9oIAJio6k8De454nYxPdMsvHjxX
Cu+fGsI398xgvlJvQCnqTqERjCym1vTByzRvRC0pxG5f04oPT7WhlPjeUQ9+KRaz
W9In/PftDFjiDRKuUJrrcle1DyjaFU+nx2SlWI9BCEmBImkC98MzKgqXsckwfwzm
ez4Afxm16kG6ltSyKv+X219Hq24CNcRS0Gc6k5YwJyRKQTniusyku6vn3TDpu/WZ
2AO8jUoSoiS/r5+Qxd2mLrSpe3CzdUs3WuynCq9k+KZCPII7uL4FcDVsCk1BOLcn
d/8bxSf5URDIK9D9OT25ANAX6XoWy/rGHVUxQhF3CEIO2ONVxXG7nH946H9Tjtg=
=+Rcl
-----END PGP SIGNATURE-----