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