summaryrefslogtreecommitdiff
path: root/keyboards/lets_split/lets_split.c
diff options
context:
space:
mode:
authorclimbalima2016-11-16 19:49:38 -0500
committerclimbalima2016-11-16 19:49:38 -0500
commit21b6b4e6c4d6872164a13e8d31e3e0a9f146ea60 (patch)
tree4d51176d38e38de3aed6e69d45ce1f742be279ba /keyboards/lets_split/lets_split.c
parent668c7397023ad5c9d338b2165699af453f84af0a (diff)
should have fixed conflixed
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 8bb33f951..117b727a8 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