diff options
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 5bee55319..91b11f03f 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/>. | |||
| 61 | //#define NO_ACTION_ONESHOT | 61 | //#define NO_ACTION_ONESHOT |
| 62 | //#define NO_ACTION_MACRO | 62 | //#define NO_ACTION_MACRO |
| 63 | //#define NO_ACTION_FUNCTION | 63 | //#define NO_ACTION_FUNCTION |
| 64 | <<<<<<< HEAD | ||
| 65 | ======= | ||
| 66 | <<<<<<< HEAD | ||
| 67 | >>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df | ||
| 64 | #ifdef SUBPROJECT_rev1 | 68 | #ifdef SUBPROJECT_rev1 |
| 65 | #include "rev1/config.h" | 69 | #include "rev1/config.h" |
| 66 | #endif | 70 | #endif |
| @@ -68,3 +72,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 68 | #include "rev2/config.h" | 72 | #include "rev2/config.h" |
| 69 | #endif | 73 | #endif |
| 70 | #endif | 74 | #endif |
| 75 | <<<<<<< HEAD | ||
| 76 | ======= | ||
| 77 | |||
| 78 | |||
| 79 | |||
| 80 | >>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df | ||