From c5e0e0cb78ea160d7139823bd78bdeb526638f8e Mon Sep 17 00:00:00 2001
From: jpirnay <jens@pirnay.com>
Date: Wed, 8 Apr 2026 10:58:41 +0200
Subject: [PATCH] Fix merge conflict

---
 lib/GfxRenderer/GfxRenderer.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/GfxRenderer/GfxRenderer.cpp b/lib/GfxRenderer/GfxRenderer.cpp
index a2c33855..4bcf1873 100644
--- a/lib/GfxRenderer/GfxRenderer.cpp
+++ b/lib/GfxRenderer/GfxRenderer.cpp
@@ -756,7 +756,6 @@ void GfxRenderer::drawText(const int fontId, const int x, const int y, const cha
   int lastBaseWidth = 0;
   int lastBaseTop = 0;
   int lastBaseAdvanceFP = 0;  // 12.4 fixed-point
-  int lastBaseAdvanceFP = 0;  // 12.4 fixed-point
   int32_t prevAdvanceFP = 0;  // 12.4 fixed-point: prev glyph's advance + next kern for snap
 
   // cannot draw a NULL / empty string