From cfa8b4adb728c686d2f8ac0ef4afd986d856b72c Mon Sep 17 00:00:00 2001
From: Valentin Dubois <valentin.dubois60@gmail.com>
Date: Wed, 1 May 2024 11:33:20 +0200
Subject: [PATCH] cleaned a merge typo

---
 frontend/device/kobo/device.lua | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/frontend/device/kobo/device.lua b/frontend/device/kobo/device.lua
index 614bec3b6..2bebb398f 100644
--- a/frontend/device/kobo/device.lua
+++ b/frontend/device/kobo/device.lua
@@ -598,16 +598,7 @@ local KoboMonza = Kobo:extend{
     },
     battery_sysfs = "/sys/class/power_supply/bd71827_bat",
     power_dev = "/dev/input/by-path/platform-bd71828-pwrkey.6.auto-event",
-<<<<<<< HEAD
     isSMP = yes,
-||||||| c6ddced5
-    isMTK = yes,
-    touch_snow_protocol = true, -- fix for unresponsive touch screen
-    isSMP = yes, -- device is dual core
-=======
-    isMTK = yes,
-    isSMP = yes, -- device is dual core
->>>>>>> 27b14cd69395e6db82f561777aa7643293f5df1d
     hasColorScreen = yes,
 }