Kris De Volder 2dfa424246 Don't fail build on merge failure ...

Be more lenient when processing additional metadata json files.

Fixes gh-2287
Closes gh-2288

2015-01-06 15:02:05 -08:00

..

src

Don't fail build on merge failure

2015-01-06 15:02:05 -08:00

pom.xml

Code formatting

2014-12-16 09:30:45 -08:00