From c41fd4b75c223d1ef44e8b7820a94801752790fc Mon Sep 17 00:00:00 2001
From: Patrick Georgi <pgeorgi@chromium.org>
Date: Thu, 30 Apr 2015 14:30:08 +0200
Subject: [PATCH] arm/armv7: drop merge left-over

Fixes up commit 93d8e3c4 (armv7-m: add armv7-m configuration).

Change-Id: Ie0b6c90e9ce89d564e3345d2746297f39ba9121d
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-on: http://review.coreboot.org/10042
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
---
 src/arch/arm/armv7/Makefile.inc | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/arch/arm/armv7/Makefile.inc b/src/arch/arm/armv7/Makefile.inc
index 3a71d9844f..3d1043f7d7 100644
--- a/src/arch/arm/armv7/Makefile.inc
+++ b/src/arch/arm/armv7/Makefile.inc
@@ -91,8 +91,6 @@ verstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c
 ## ROM stage
 ################################################################################
 ifeq ($(CONFIG_ARCH_ROMSTAGE_ARMV7),y)
->>>>>>> 34b838e... armv7-m: add armv7-m configuration
-
 romstage-y += cache.c
 romstage-y += cpu.S
 romstage-y += exception.c