[U-Boot] Remove <<<<<< HEAD from boards.cfg

[Tom Rini]

On Sat, Nov 02, 2013 at 11:08:49PM -0700, Wink Saville wrote:

> ---
>  boards.cfg | 1 -
>  1 file changed, 1 deletion(-)

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20131108/7e6f250f/attachment.pgp>