4823: Files now fall under collection's lock. Add tests for merge conflicts.
[arvados.git] / sdk / java / .settings /
drwxr-xr-x   ..
-rw-r--r-- 203 org.eclipse.jdt.core.prefs