Resolving conflicts with master branch ...
Resolving conflicts with master branch ...
sync ...
Merge branch 'master' of https://github.com/kferles/Cpm.git
Javadoc