Merge branch 'user_led_configuration' into infinity60

Conflicts: keyboards/infinity60/keymaps/jpetermans/keymap.c
sd · May 24, 2017 · e6c9b07 · e6c9b07
2 parents 2dcd6c3 + f54b477
commit e6c9b07
Show file tree

Hide file tree

Showing 7 changed files with 595 additions and 616 deletions.
diff --git a/keyboards/infinity60/MEMO.txt b/keyboards/infinity60/MEMO.txt
diff --git a/keyboards/infinity60/keymaps/jpetermans/Makefile b/keyboards/infinity60/keymaps/jpetermans/Makefile
@@ -1,5 +1,3 @@
-#BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
-#BOOTMAGIC_ENABLE = yes
 
 ifndef QUANTUM_DIR
 	include ../../../../Makefile