From 9266212117cfcb337bc51b8db3f97c6c54f86857 Mon Sep 17 00:00:00 2001 From: Peter Turcsanyi <35004384+turcsanyip@users.noreply.github.com> Date: Mon, 8 Mar 2021 15:08:34 +0100 Subject: [PATCH] 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 2142aa4ba4..e026a2b1d3 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