drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

Merge branch 'master'

Browse source 
Conflicts:
	keyboards/planck/keymaps/bone2planck/keymap.c
This commit is contained in:
Jason Janse van Rensburg 2016-08-30 14:54:00 +02:00
commit fc2ca62a3b
694 changed files with 35444 additions and 13830 deletions
Download patch file Download diff file Expand all files Collapse all files

3
keyboards/planck/keymaps/bone2planck/keymap.c
View file

@ -1,5 +1,4 @@

#include "planck.h"
#include "planck.h"
#ifdef BACKLIGHT_ENABLE
#include "backlight.h"
#endif