boards.cfg: remove git leftovers
Remove 'HEAD' line which is most likely left there while rebasing. It was
introduced in commit 877bfe37dc00b0ae59f37742954a62bce3fdf3a0.
Signed-off-by: Luka Perkov <luka@openwrt.org>
diff --git a/boards.cfg b/boards.cfg
index 4eb5eb4..375f2d4 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>