2 files changed, 9 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) {
diff --git a/glcd.h b/glcd.h
index 69d5c6ed..c67541c9 100644
--- a/glcd.h
+++ b/glcd.h
@@ -55,7 +55,11 @@ void lcdDrawRectString(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, const
 void lcdDrawCircle(uint16_t x, uint16_t y, uint16_t radius, uint8_t filled, uint16_t color);
 
 void lcdSetFontTransparency(uint8_t transparency);
+<<<<<<< HEAD
 void lcdSetFont(const uint8_t *fnt);
+=======
+void lcdSetFont(const uint8_t *newFont);
+>>>>>>> cleanups
 void lcdDrawChar(char c);
 void lcdPutString(const char *str);
 void lcdDrawString(uint16_t x, uint16_t y, const char *str, uint16_t color, uint16_t bkcolor);