17579: fix for wrong conflict resolution
[arvados-workbench2.git] / apache-2.0.txt
2018-05-23 Ward VandewegeInitial commit: add license files.