1 files changed, 5 insertions, 0 deletions
diff --git a/glcd.c b/glcd.c
index 42685439..e8498961 100644
--- a/glcd.c
+++ b/glcd.c
@@ -117,8 +117,13 @@ void lcdDrawLine(uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2, uint16_t co
    }
 }
 
+<<<<<<< HEAD
 void lcdSetFont(const uint8_t *fnt) {
 	font = fnt;
+=======
+void lcdSetFont(const uint8_t *newFont) {
+	font = newFont;
+>>>>>>> cleanups
 }
 
 void lcdSetFontTransparency(uint8_t transparency) {