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 396d51555..6ce6e4373 100644 --- a/keyboards/lets_split/Makefile +++ b/keyboards/lets_split/Makefile | |||
| @@ -1,3 +1,6 @@ | |||
| 1 | <<<<<<< HEAD | ||
| 2 | ifndef MAKEFILE_INCLUDED | ||
| 3 | ======= | ||
| 1 | SRC += matrix.c \ | 4 | SRC += matrix.c \ |
| 2 | i2c.c \ | 5 | i2c.c \ |
| 3 | split_util.c \ | 6 | split_util.c \ |
| @@ -74,5 +77,6 @@ SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend | |||
| 74 | CUSTOM_MATRIX = yes | 77 | CUSTOM_MATRIX = yes |
| 75 | SUBPROJECT_DEFAULT = rev2 | 78 | SUBPROJECT_DEFAULT = rev2 |
| 76 | ifndef QUANTUM_DIR | 79 | ifndef QUANTUM_DIR |
| 80 | >>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df | ||
| 77 | include ../../Makefile | 81 | include ../../Makefile |
| 78 | endif \ No newline at end of file | 82 | endif \ No newline at end of file |