Fix Select Local Version or Keep Both behaviour when solving file coflict
[pub/Android/ownCloud.git] / automationTest / resources /
drwxr-xr-x   ..
-rw-r--r-- 70 .gitignore