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