From 6cce01fcbba64335d1e2f8502c32bce779687331 Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Mon, 12 Nov 2018 11:40:41 +0200
Subject: [PATCH] rpi-firmware: post-merge fix

---
 package/rpi-firmware/rpi-firmware.hash | 5 +----
 package/rpi-firmware/rpi-firmware.mk   | 4 ----
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/package/rpi-firmware/rpi-firmware.hash b/package/rpi-firmware/rpi-firmware.hash
index 068782346b..9dd9e7a302 100644
--- a/package/rpi-firmware/rpi-firmware.hash
+++ b/package/rpi-firmware/rpi-firmware.hash
@@ -1,6 +1,3 @@
 # Locally computed
-<<<<<<< HEAD
 sha256 d1f9c58957dfe681fff7e1cf1eabb9e0f6fdc99720f1d059fb24a37750573310 rpi-firmware-5b49caa17e91d0e64024380119ad739bb201c674.tar.gz
-=======
-sha256 5edff641f216d2e09c75469dc2e9fc66aff290e212a1cd43ed31c499f99ea055 rpi-firmware-287af2a2be0787a5d45281d1d6183a2161c798d4.tar.gz
->>>>>>> 2018.08.2
+
diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk
index f58440f751..2ed983fbcb 100644
--- a/package/rpi-firmware/rpi-firmware.mk
+++ b/package/rpi-firmware/rpi-firmware.mk
@@ -4,11 +4,7 @@
 #
 ################################################################################
 
-<<<<<<< HEAD
 RPI_FIRMWARE_VERSION = 5b49caa17e91d0e64024380119ad739bb201c674
-=======
-RPI_FIRMWARE_VERSION = 287af2a2be0787a5d45281d1d6183a2161c798d4
->>>>>>> 2018.08.2
 RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
 RPI_FIRMWARE_LICENSE = BSD-3-Clause
 RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom