Merge remote-tracking branch 'upstream/master'

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

diff --git a/keyboards/lets_split/config.h b/keyboards/lets_split/config.h
index 91b11f03fd8692c173a9579c5b408fcbeaeb55e6..4db45ab0b3f0a02b118ffa56ce590559243a92f6 100644 (file)
--- a/keyboards/lets_split/config.h
+++ b/keyboards/lets_split/config.h
@@ -49,6 +49,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define IS_COMMAND() ( \
     keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
 )
+
 /* disable debug print */
 //#define NO_DEBUG
 
@@ -61,10 +62,7 @@ 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
@@ -72,9 +70,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #include "rev2/config.h"
 #endif
 #endif
-<<<<<<< HEAD
-=======
-
-
-
->>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df