Fixed 'keep both' action in conflicts dialog (both resulting file were linked to...
[pub/Android/ownCloud.git] / src / com /
drwxr-xr-x   ..
drwxr-xr-x - owncloud