Resolve merge conflict
[arvados.git] / LICENSE
2010-07-28 bobaman@google.comBasic project skeleton.