Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-8284: Removed diff merge leftover from the assembly NOTICE file (#4865)

This commit is contained in:
Peter Turcsanyi 2021-03-08 15:08:34 +01:00 committed by GitHub
parent 29ebec071e
commit 9266212117
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nifi-assembly/NOTICE
View File

@ -1842,7 +1842,6 @@ The following binary components are provided under the Apache Software License v
- Apache MINA SSHD
- Apache Commons-Net
<<<<<<< HEAD
(ASLv2) Nimbus Language Tags
The following NOTICE information applies:
Nimbus Language Tags