diff options
Diffstat (limited to 'keyboards/lets_split/Makefile')
-rw-r--r-- | keyboards/lets_split/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/keyboards/lets_split/Makefile b/keyboards/lets_split/Makefile index 396d515553..6ce6e43731 100644 --- a/keyboards/lets_split/Makefile +++ b/keyboards/lets_split/Makefile @@ -1,3 +1,6 @@ +<<<<<<< HEAD +ifndef MAKEFILE_INCLUDED +======= SRC += matrix.c \ i2c.c \ split_util.c \ @@ -74,5 +77,6 @@ SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend CUSTOM_MATRIX = yes SUBPROJECT_DEFAULT = rev2 ifndef QUANTUM_DIR +>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df include ../../Makefile endif
\ No newline at end of file |