diff mbox

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

Message ID 1383458929-1191-1-git-send-email-wink@saville.com
State Accepted
Delegated to: Tom Rini
Headers show

Commit Message

Wink Saville Nov. 3, 2013, 6:08 a.m. UTC 
---
 boards.cfg | 1 -
 1 file changed, 1 deletion(-)

Comments

Tom Rini Nov. 8, 2013, 10:30 p.m. UTC | #1 
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!
diff mbox

Patch

diff --git a/boards.cfg b/boards.cfg
index 5e10125..9fecbed 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -43,7 +43,6 @@ 
 # Status, Arch, CPU:SPLCPU, SoC, Vendor, Board name, Target, Options, Maintainers
 ###########################################################################################################
 
-<<<<<<< HEAD
 Active  arm         arm1136        -           armltd          integrator          integratorcp_cm1136                  integratorcp:CM1136                                                                                                               Linus Walleij <linus.walleij@linaro.org>
 Active  arm         arm1136        mx31        -               -                   imx31_phycore                        -                                                                                                                                 -
 Active  arm         arm1136        mx31        davedenx        -                   qong                                 -                                                                                                                                 Wolfgang Denk <wd@denx.de>