summaryrefslogtreecommitdiffstats
path: root/keyboards/lets_split/lets_split.c
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/lets_split/lets_split.c')
-rw-r--r--keyboards/lets_split/lets_split.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/keyboards/lets_split/lets_split.c b/keyboards/lets_split/lets_split.c
index fe2d4bc19..8bb33f951 100644
--- a/keyboards/lets_split/lets_split.c
+++ b/keyboards/lets_split/lets_split.c
@@ -1,3 +1,6 @@
#include "lets_split.h"
+<<<<<<< HEAD
+=======
+>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df