Github user jdye64 commented on the issue:
https://github.com/apache/nifi/pull/1595
@trixpan I tried talking it out but that didn't seem to solve the
conflict?? Will try more forceful procedures when I get off the road and near a
computer ;) thanks for taking a look at this!
---
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.
---
