Github user mattyb149 commented on the issue:

    https://github.com/apache/nifi/pull/2451
  
    There's a merge conflict now that #2450 is merged, I'm guessing it's 
because you built this PR with your other commit from 2450 as well. Can you 
rebase / replace your NIFI-4844 commit with the one from master? Please and 
thanks :) In the meantime I will cherry-pick the NIFI-4846 commit into master 
for testing


---

Reply via email to