Merge pull request #1219 from owncloud/sync_full_folder__fix_conflict_save_local_version
[pub/Android/ownCloud.git] / oc_jb_workaround / .settings /
drwxr-xr-x   ..
-rw-r--r-- 173 org.eclipse.jdt.core.prefs