diff options
| author | climbalima <climbalima@gmail.com> | 2016-11-16 19:49:38 -0500 |
|---|---|---|
| committer | climbalima <climbalima@gmail.com> | 2016-11-16 19:49:38 -0500 |
| commit | 21b6b4e6c4d6872164a13e8d31e3e0a9f146ea60 (patch) | |
| tree | 4d51176d38e38de3aed6e69d45ce1f742be279ba /keyboards/lets_split/config.h | |
| parent | 668c7397023ad5c9d338b2165699af453f84af0a (diff) | |
| download | firmware-21b6b4e6c4d6872164a13e8d31e3e0a9f146ea60.tar.gz firmware-21b6b4e6c4d6872164a13e8d31e3e0a9f146ea60.tar.bz2 firmware-21b6b4e6c4d6872164a13e8d31e3e0a9f146ea60.zip | |
should have fixed conflixed
Diffstat (limited to 'keyboards/lets_split/config.h')
| -rw-r--r-- | keyboards/lets_split/config.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/keyboards/lets_split/config.h b/keyboards/lets_split/config.h index 91b11f03f..1b7bbcbbb 100644 --- a/keyboards/lets_split/config.h +++ b/keyboards/lets_split/config.h @@ -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
\ No newline at end of file |