1 files changed, 0 insertions, 5 deletions
diff --git a/glcd.c b/glcd.c
index 34ff53d0..8c86c8cf 100644
--- a/glcd.c
+++ b/glcd.c
@@ -104,13 +104,8 @@ 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) {