From 6a99adffa37b6bb0b0b22c0df998356b4981f72c Mon Sep 17 00:00:00 2001
From: Arvind Chauhan <arvind.chauhan@arm.com>
Date: Tue, 8 May 2018 04:57:54 +0100
Subject: configs: vexpress64: Fix typo

Signed-off-by: Arvind Chauhan <arvind.chauhan@arm.com>
---
 linaro/configs/vexpress64.conf | 1 -
 1 file changed, 1 deletion(-)

diff --git a/linaro/configs/vexpress64.conf b/linaro/configs/vexpress64.conf
index 8ceaf7f1f633..e5fba9d8c982 100644
--- a/linaro/configs/vexpress64.conf
+++ b/linaro/configs/vexpress64.conf
@@ -86,7 +86,6 @@ CONFIG_ARM_TIMER_SP804=y
 CONFIG_ARM_CPUIDLE=y
 CONFIG_PM_DEBUG=y
 CONFIG_PM_RUNTIME=y
-<<<<<<< 77e347a9710bc21c27dd3b2fc151be9dad471ee2
 CONFIG_TEE=y
 CONFIG_OPTEE=y
 CONFIG_DEVMEM=y
-- 
cgit v1.2.3