boards.cfg: remove git leftovers

Remove 'HEAD' line which is most likely left there while rebasing. It was introduced in commit 877bfe3. Signed-off-by: Luka Perkov <[email protected]>
MrVan · Nov 8, 2013 · 3314204 · 3314204
1 parent 7ec0cde
commit 3314204
Showing 1 changed file with 0 additions and 1 deletion.
diff --git 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 <[email protected]>
 Active  arm         arm1136        mx31        -               -                   imx31_phycore                        -                                                                                                                                 -
 Active  arm         arm1136        mx31        davedenx        -                   qong                                 -                                                                                                                                 Wolfgang Denk <[email protected]>