diff options
| author | climbalima <climbalima@gmail.com> | 2016-11-16 19:26:38 -0500 |
|---|---|---|
| committer | climbalima <climbalima@gmail.com> | 2016-11-16 19:26:38 -0500 |
| commit | 5cac51a773bef7fc8064390ac3ee499121a9611d (patch) | |
| tree | 765b36006bb3d60f51dd0af27e89dac7bce2a59b /keyboards/lets_split/config.h | |
| parent | 1dd6ceb45dfcf5f0991b84fea5a761a35df7fcda (diff) | |
| parent | bce6e52391da7c5f620c96a91857940f0dee19df (diff) | |
Merge https://github.com/climbalima/qmk_firmware
Diffstat (limited to 'keyboards/lets_split/config.h')
| -rw-r--r-- | keyboards/lets_split/config.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/keyboards/lets_split/config.h b/keyboards/lets_split/config.h index 5bee553199..91b11f03fd 100644 --- a/keyboards/lets_split/config.h +++ b/keyboards/lets_split/config.h @@ -61,6 +61,10 @@ 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 @@ -68,3 +72,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "rev2/config.h" #endif #endif +<<<<<<< HEAD +======= + + + +>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df |