From 46b385955e0177cfbdebac23df7907f53e945d89 Mon Sep 17 00:00:00 2001
From: Yevhen Mykhno <yevhen.mykhno@globallogic.com>
Date: Fri, 29 Jul 2022 17:03:45 +0300
Subject: Fix merge conflict in the mtre.conf file

---
 conf/machine/mtre.conf | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'conf/machine')

diff --git a/conf/machine/mtre.conf b/conf/machine/mtre.conf
index 8405351..57cfdde 100644
--- a/conf/machine/mtre.conf
+++ b/conf/machine/mtre.conf
@@ -6,11 +6,7 @@ require conf/machine/include/tune-arm926ejs.inc
 
 MACHINE_FEATURES = "ext2 ext3 usbhost usbgadget ppp"
 PREFERRED_PROVIDER_virtual/kernel = "linux-at91"
-<<<<<<< HEAD
-PREFERRED_VERSION_linux = "4.9.%"
-=======
 PREFERRED_VERSION_linux-at91 = "5.4.81"
->>>>>>> b5b1fc2... mLinux 6 current preferred kernel is 5.4.81
 
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "kernel-module-vizzini"
 PREFERRED_VERSION_kernel-module-vizzini ?= "1.1"
-- 
cgit v1.2.3