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.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/keyboards/lets_split/lets_split.c b/keyboards/lets_split/lets_split.c
index 8bb33f9514..117b727a85 100644
--- a/keyboards/lets_split/lets_split.c
+++ b/keyboards/lets_split/lets_split.c
@@ -1,6 +1 @@
-#include "lets_split.h"
-
-<<<<<<< HEAD
-=======
-
->>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
+#include "lets_split.h" \ No newline at end of file