Github user olegz commented on the issue:
https://github.com/apache/nifi/pull/257
@pvillard31 Had a merge conflict again, but fixed it myself. Nothing to
do, just making comment for traceability.
---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
