You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@nifi.apache.org by jo...@apache.org on 2021/03/09 21:32:53 UTC

[nifi] 04/06: NIFI-8284: Removed diff merge leftover from the assembly NOTICE file (#4865)

This is an automated email from the ASF dual-hosted git repository.

joewitt pushed a commit to branch support/nifi-1.13
in repository https://gitbox.apache.org/repos/asf/nifi.git

commit 9fcbef64c09dd35960805bc7e58321034b1ed08f
Author: Peter Turcsanyi <35...@users.noreply.github.com>
AuthorDate: Mon Mar 8 15:08:34 2021 +0100

    NIFI-8284: Removed diff merge leftover from the assembly NOTICE file (#4865)
---
 nifi-assembly/NOTICE | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nifi-assembly/NOTICE b/nifi-assembly/NOTICE
index 1609b30..e501ba3 100644
--- a/nifi-assembly/NOTICE
+++ b/nifi-assembly/NOTICE
@@ -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