Remove patch conflict remains

Two "<<<<<<< HEAD" lines remained from what seems to be a previous patch conflict. Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
9 years ago · f6e3c833f3
1 changed files with 0 additions and 2 deletions
--- a/2
+++ b/2
@ -2782,8 +2782,6 @@ Licence: Redistributable. See LICENCE.nvidia for details
				@@ -2782,8 +2782,6 @@ Licence: Redistributable. See LICENCE.nvidia for details

 --------------------------------------------------------------------------

-<<<<<<< HEAD
-<<<<<<< HEAD
 Driver: atusb - ATUSB IEEE 802.15.4 transceiver driver

 File: atusb/atusb-0.2.dfu