Sebastian Stenzel 1c54e4f4ad in the unlikely event of an alternative name already being used, choose a new random conflict id.

2016-05-12 16:13:03 +02:00

..

main/java/org/cryptomator

in the unlikely event of an alternative name already being used, choose a new random conflict id.

2016-05-12 16:13:03 +02:00

test

transparently show sync conflicts (fixes #98)

2016-05-12 16:08:52 +02:00