RepoMirrors
/
linux-firmware
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Alexandre Courbot 2015-07-16 15:57:58 +09:00
parent 696403047a
commit f6e3c833f3
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
WHENCE
View File

@ -2782,8 +2782,6 @@ Licence: Redistributable. See LICENCE.nvidia for details
-------------------------------------------------------------------------- --------------------------------------------------------------------------
<<<<<<< HEAD
<<<<<<< HEAD
Driver: atusb - ATUSB IEEE 802.15.4 transceiver driver Driver: atusb - ATUSB IEEE 802.15.4 transceiver driver
File: atusb/atusb-0.2.dfu File: atusb/atusb-0.2.dfu