summaryrefslogtreecommitdiff
path: root/keyboards/lets_split/config.h
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/lets_split/config.h')
-rw-r--r--keyboards/lets_split/config.h13
1 files changed, 2 insertions, 11 deletions
diff --git a/keyboards/lets_split/config.h b/keyboards/lets_split/config.h
index 91b11f03fd..1b7bbcbbb9 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