From: Jack Humbert <jack.humb@gmail.com>
Date: Tue, 4 Apr 2017 01:06:40 +0000 (-0400)
Subject: Merge branch 'master' into master
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=27aa185222b709dc53a1478e46d6e04271dc199c;p=qmk_firmware.git

Merge branch 'master' into master
---

27aa185222b709dc53a1478e46d6e04271dc199c
diff --cc keyboards/lets_split/ssd1306.c
index 4bf3a8743,76348ab7f..5c6dff27f
--- a/keyboards/lets_split/ssd1306.c
+++ b/keyboards/lets_split/ssd1306.c
@@@ -1,9 -1,7 +1,9 @@@
 +#ifdef SSD1306OLED
++
+ #include "ssd1306.h"
  #include "config.h"
  #include "i2c.h"
- #include <stdbool.h>
  #include <string.h>
- #include <stdio.h>
  #include "print.h"
  #include "lets_split.h"
  #include "common/glcdfont.c"