From a509885ffe353b90d7a267500970512f2f6adea7 Mon Sep 17 00:00:00 2001
From: Konstantin Porotchkin <kostap@marvell.com>
Date: Thu, 24 Aug 2017 13:57:28 +0300
Subject: fix: Remove garbadge from the main makefile

Clean the Makefile from rebase garbage remainings

Change-Id: I132dfbbc7f722ad2d188a102d876d65b04d9c8b4
Signed-off-by: Konstantin Porotchkin <kostap@marvell.com>
Reviewed-on: http://vgitil04.il.marvell.com:8080/43371
---
 Makefile | 1 -
 1 file changed, 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index d19df5eb..bef837eb 100644
--- a/Makefile
+++ b/Makefile
@@ -481,7 +481,6 @@ DDR_TOPOLOGY		?= 0
 
 BOOTDEV			?= SPINOR
 PARTNUM			?= 0
->>>>>>> makefile: mvebu: update makefile for a3700 build
 
 TIM_IMAGE		:= $$(grep "Image Filename:" -m 1 $(DOIMAGE_CFG) | cut -c 17-)
 TIMBLDARGS		:= $(MARVELL_SECURE_BOOT) $(BOOTDEV) $(IMAGESPATH) $(CLOCKSPATH) $(CLOCKSPRESET) \
-- 
cgit