Fix Select Local Version or Keep Both behaviour when solving file coflict
[pub/Android/ownCloud.git] / .tx /
drwxr-xr-x   ..
-rw-r--r-- 3330 config