Jeremy Long fd47ede9d6 resolve merge conflicts

2017-12-09 07:03:33 -05:00

..

src

resolve merge conflicts

2017-12-09 07:03:33 -05:00

pom.xml

due to removing the retired attribute from NodePackageAnalyzer we should increment the minor version

2017-11-26 09:08:36 -05:00