From 47f63ab27635b07ec0129076322325bb08adda28 Mon Sep 17 00:00:00 2001
From: ClicketySplit <101202583+ClicketySplit@users.noreply.github.com>
Date: Wed, 26 Apr 2023 07:40:53 -0600
Subject: [PATCH] Resolve base conflict.

---
 .../shields/leeloo/leeloo_right.overlay       | 23 ++++++++-----------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/app/boards/shields/leeloo/leeloo_right.overlay b/app/boards/shields/leeloo/leeloo_right.overlay
index 79f8eef3..ee0b5cd3 100644
--- a/app/boards/shields/leeloo/leeloo_right.overlay
+++ b/app/boards/shields/leeloo/leeloo_right.overlay
@@ -6,25 +6,20 @@
 #include "leeloo.dtsi"
 
 &default_transform {
-    col-offset = <6>;
+	col-offset = <6>;
 };
 
 &kscan0 {
-    col-gpios
-        = <&pro_micro 10 GPIO_ACTIVE_HIGH>
-        , <&pro_micro 16 GPIO_ACTIVE_HIGH>
-        , <&pro_micro 14 GPIO_ACTIVE_HIGH>
-        , <&pro_micro 15 GPIO_ACTIVE_HIGH>
-        , <&pro_micro 18 GPIO_ACTIVE_HIGH>
-        , <&pro_micro 19 GPIO_ACTIVE_HIGH>
-        ;
+	col-gpios
+		= <&pro_micro 10 GPIO_ACTIVE_HIGH>
+		, <&pro_micro 16 GPIO_ACTIVE_HIGH>
+		, <&pro_micro 14 GPIO_ACTIVE_HIGH>
+		, <&pro_micro 15 GPIO_ACTIVE_HIGH>
+		, <&pro_micro 18 GPIO_ACTIVE_HIGH>
+		, <&pro_micro 19 GPIO_ACTIVE_HIGH>
+		;
 };
 
 &right_encoder {
-<<<<<<< HEAD
-    status = "okay";
-};
-=======
 	status = "okay";
 };
->>>>>>> 69308eaf (Leeloo v2 and Leeloo v1 updates to support Zephyr 3.2)