kb01/zmk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolve base conflict.

Browse source
This commit is contained in:
ClicketySplit 2023-04-26 07:40:53 -06:00 • committed by GitHub
parent 82e396c8d2
commit 47f63ab276
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/boards/shields/leeloo/leeloo_right.overlay
View file

@ -21,10 +21,5 @@
}; };
&right_encoder { &right_encoder {
<<<<<<< HEAD
status = "okay"; status = "okay";
}; };
=======
status = "okay";
};
>>>>>>> 69308eaf (Leeloo v2 and Leeloo v1 updates to support Zephyr 3.2)