Removed diff merge leftover from the assembly NOTICE 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
