diff options
Diffstat (limited to 'keyboards/maxipad/Makefile')
| -rw-r--r-- | keyboards/maxipad/Makefile | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/keyboards/maxipad/Makefile b/keyboards/maxipad/Makefile index 3f6d133c9..c65665142 100644 --- a/keyboards/maxipad/Makefile +++ b/keyboards/maxipad/Makefile @@ -1,3 +1,8 @@ +<<<<<<< HEAD +ifndef MAKEFILE_INCLUDED + include ../../Makefile +endif +======= # MCU name @@ -73,3 +78,4 @@ ifndef QUANTUM_DIR endif +>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df |