Github user johnsca commented on the issue:
https://github.com/apache/bigtop/pull/112
Conflict resolved. It was the addition of a couple of lines to `pom.xml`
and `build.gradle` for the RAT fixes. They were both added lines, but git
didn't have quite enough common context to resolve it automatically.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
