Merge https://github.com/climbalima/qmk_firmware

[qmk_firmware.git] / keyboards / lets_split / config.h

diff --git a/keyboards/lets_split/config.h b/keyboards/lets_split/config.h
index 5bee553199c959fa1d48f13c7438ac4b0830ae51..91b11f03fd8692c173a9579c5b408fcbeaeb55e6 100644 (file)
--- 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