ghrrty
This commit is contained in:
parent
78222f84d5
commit
2dbc91f542
1 changed files with 6 additions and 0 deletions
|
@ -1,10 +1,16 @@
|
||||||
# Copyright (c) 2020 The ZMK Contributors
|
# Copyright (c) 2020 The ZMK Contributors
|
||||||
# SPDX-License-Identifier: MIT
|
# SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
<<<<<<< Updated upstream
|
||||||
<<<<<<< Updated upstream
|
<<<<<<< Updated upstream
|
||||||
=======
|
=======
|
||||||
#zephyr_library()
|
#zephyr_library()
|
||||||
|
|
||||||
|
#zephyr_library_sources(led.c)
|
||||||
|
>>>>>>> Stashed changes
|
||||||
|
=======
|
||||||
|
#zephyr_library()
|
||||||
|
|
||||||
#zephyr_library_sources(led.c)
|
#zephyr_library_sources(led.c)
|
||||||
>>>>>>> Stashed changes
|
>>>>>>> Stashed changes
|
||||||
add_subdirectory_ifdef(CONFIG_IS31FL3733 is31fl3733)
|
add_subdirectory_ifdef(CONFIG_IS31FL3733 is31fl3733)
|
||||||
|
|
Loading…
Add table
Reference in a new issue