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:38:01 -06:00 • committed by GitHub
parent e3af7f464a
commit cd979ae747
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/boards/shields/leeloo/Kconfig.shield
View file

@ -5,12 +5,6 @@ config SHIELD_LEELOO
bool bool
config SHIELD_LEELOO_LEFT config SHIELD_LEELOO_LEFT
<<<<<<< HEAD
def_bool $(shields_list_contains,leeloo_left)
config SHIELD_LEELOO_RIGHT
def_bool $(shields_list_contains,leeloo_right)
=======
def_bool $(shields_list_contains,leeloo_left) def_bool $(shields_list_contains,leeloo_left)
select SHIELD_LEELOO select SHIELD_LEELOO
@ -25,4 +19,3 @@ config SHIELD_LEELOO_REV2_LEFT
config SHIELD_LEELOO_REV2_RIGHT config SHIELD_LEELOO_REV2_RIGHT
def_bool $(shields_list_contains,leeloo_rev2_right) def_bool $(shields_list_contains,leeloo_rev2_right)
select SHIELD_LEELOO select SHIELD_LEELOO
>>>>>>> 69308eaf (Leeloo v2 and Leeloo v1 updates to support Zephyr 3.2)