From 64855ce2ad43f95dd268675fc7fdcd4cff30bd54 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Mon, 15 May 2017 09:35:36 -0500
Subject: Merge in some Yocto 2.1 code.

---
 recipes-bsp/u-boot/u-boot_2016.03.bb | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'recipes-bsp/u-boot')

diff --git a/recipes-bsp/u-boot/u-boot_2016.03.bb b/recipes-bsp/u-boot/u-boot_2016.03.bb
index 77fce05..1f58b50 100644
--- a/recipes-bsp/u-boot/u-boot_2016.03.bb
+++ b/recipes-bsp/u-boot/u-boot_2016.03.bb
@@ -8,11 +8,8 @@ DEPENDS += "dtc-native"
 SRCREV = "df61a74e6845ec9bdcdd48d2aff5e9c2c6debeaa"
 
 PV = "v2016.03+git${SRCPV}"
-<<<<<<< HEAD
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-2016.03:"
 SRC_URI += "file://mtcdt.patch"
 SRC_URI += "file://spl.patch"
 SRC_URI += "file://i2c.patch"
-=======
->>>>>>> Initial commit of Yocto 2.1 changes
-- 
cgit v1.2.3