diff options
| author | climbalima <climbalima@gmail.com> | 2016-11-17 01:26:38 +0100 |
|---|---|---|
| committer | climbalima <climbalima@gmail.com> | 2016-11-17 01:26:38 +0100 |
| commit | 5cac51a773bef7fc8064390ac3ee499121a9611d (patch) | |
| tree | 765b36006bb3d60f51dd0af27e89dac7bce2a59b /keyboards/lets_split/lets_split.c | |
| parent | 1dd6ceb45dfcf5f0991b84fea5a761a35df7fcda (diff) | |
| parent | bce6e52391da7c5f620c96a91857940f0dee19df (diff) | |
| download | qmk_firmware-5cac51a773bef7fc8064390ac3ee499121a9611d.tar.gz qmk_firmware-5cac51a773bef7fc8064390ac3ee499121a9611d.tar.xz | |
Merge https://github.com/climbalima/qmk_firmware
Diffstat (limited to 'keyboards/lets_split/lets_split.c')
| -rw-r--r-- | keyboards/lets_split/lets_split.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/keyboards/lets_split/lets_split.c b/keyboards/lets_split/lets_split.c index 851299aa2..8bb33f951 100644 --- a/keyboards/lets_split/lets_split.c +++ b/keyboards/lets_split/lets_split.c @@ -1,2 +1,6 @@ #include "lets_split.h" +<<<<<<< HEAD +======= + +>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df |