OC-1701: Conflict detected in keep-in-sync
[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