From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 20 Feb 2017 21:02:52 +0000 (+0100)
Subject: linux: fix up bad merge conflict
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=09c989420db1599c7650ae614c672ea5e699d641;p=buildroot.git

linux: fix up bad merge conflict

Fix commit 400eaa3452e9380ec77ac62266530055506ea6e7 ("linux: bump
default to version 4.10") in which a conflict was not correctly
resolved.

Reported-by: Romain Naour <romain.naour@smile.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---

diff --git a/linux/Config.in b/linux/Config.in
index 7f18219009..890b8483e1 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -97,11 +97,7 @@ endif
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-<<<<<<< a1e02440f3035cfbe5119c00457b3e1c2f7ac4d1
-	default "4.9.9" if BR2_LINUX_KERNEL_LATEST_VERSION
-=======
 	default "4.10" if BR2_LINUX_KERNEL_LATEST_VERSION
->>>>>>> linux: bump default to version 4.10
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
 		if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL