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>

diff --git a/WHENCE b/WHENCE
index ea6f4a6012e3936f77deef6e522fd5dd53d1d189..5605cd68b6e661977c5f5813e3a4f34a32be0195 100644 (file)
--- a/WHENCE
+++ b/WHENCE
@@ -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