Handle conflicts from git merge release-20160315
[tools/mic.git] / etc /
drwxr-xr-x   ..
drwxr-xr-x - bash_completion.d
-rw-r--r-- 659 mic.conf.in
drwxr-xr-x - zsh_completion.d