Merge pull request #1349 from jpetermans/infinity60

[qmk_firmware.git] / keyboards / lets_split / lets_split.c

diff --git a/keyboards/lets_split/lets_split.c b/keyboards/lets_split/lets_split.c
index 8bb33f9514b54fc139dca18f6505221cde1f92dc..117b727a85543f4d2abdfeb6df3fad9902c05ffb 100644 (file)
--- 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