From f6e3c833f319c87356728dd8016b3377e18e40c0 Mon Sep 17 00:00:00 2001
From: Alexandre Courbot <acourbot@nvidia.com>
Date: Thu, 16 Jul 2015 15:57:58 +0900
Subject: [PATCH] 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>
---
 WHENCE | 2 --
 1 file changed, 2 deletions(-)

diff --git a/WHENCE b/WHENCE
index ea6f4a60..5605cd68 100644
--- 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