Resolve merge conflict
[arvados.git] / CONTRIBUTING.md
2013-09-09 Steven BazylRename contributing file to match github expectations