drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

should have fixed conflixed

Browse source
This commit is contained in:
climbalima 2016-11-16 19:49:38 -05:00
parent 668c739702
commit 21b6b4e6c4
13 changed files with 10 additions and 268 deletions
Download patch file Download diff file Expand all files Collapse all files

13
keyboards/lets_split/config.h
View file

@ -61,20 +61,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_ONESHOT
//#define NO_ACTION_MACRO
//#define NO_ACTION_FUNCTION
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
#ifdef SUBPROJECT_rev1
#include "rev1/config.h"
#endif
#ifdef SUBPROJECT_rev2
#include "rev2/config.h"
#endif
#endif
<<<<<<< HEAD
=======
>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
#endif