humpfhumpf commented on pull request #4167: URL: https://github.com/apache/nifi/pull/4167#issuecomment-762165905
> @humpfhumpf the conflicts has been resolved. Thank you! For an unknown reason (to me), github still detects a conflict on these 2 files: ``` nifi-nar-bundles/nifi-extension-utils/nifi-processor-utils/src/main/java/org/apache/nifi/processor/util/list/AbstractListProcessor.java nifi-nar-bundles/nifi-extension-utils/nifi-processor-utils/src/test/java/org/apache/nifi/processor/util/list/TestAbstractListProcessor.java ``` ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected]
