Skip to contentSkip to conversation

boards.cfg: remove git leftovers

PATCH In review Luka Perkov 2 participants 2 messages Oct 31, 2013 – Nov 8, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 boards.cfg: remove git leftovers

Remove 'HEAD' line which is most likely left there while rebasing. It was introduced in commit 877bfe37dc00b0ae59f37742954a62bce3fdf3a0.

---
 boards.cfg | 1 -
 1 file changed, 1 deletion(-)
boards.cfg +0 -1
index 5e10125..9fecbed 100644
@@ -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 <[email protected]>
 Active  arm         arm1136        mx31        -               -                   imx31_phycore                        -                                                                                                                                 -
 Active  arm         arm1136        mx31        davedenx        -                   qong                                 -                                                                                                                                 Wolfgang Denk <[email protected]>
Signature · 1 line
1.8.4.2
#1 lore raw
Quoted 4 lines · Luka Perkov

Remove 'HEAD' line which is most likely left there while rebasing. It was introduced in commit 877bfe37dc00b0ae59f37742954a62bce3fdf3a0.

Applied to u-boot/master, thanks!

Signature · 8 lines
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/e2b7610c/attachment.pgp>