squashed bug

2024-04-08 10:56:29 -06:00
parent 4d2d8f99f4
commit e2ac6e437d
1 changed files with 0 additions and 3 deletions
@@ -189,10 +189,7 @@ public class Settings {
            fontName = "HackNerdFontMono-Regular";
            fontFilepath = "/usr/share/fonts/TTF/" + fontName + ".ttf";
        }
-<<<<<<< HEAD

-=======
->>>>>>> main
        // Register the font with the GraphicsEnvironment.
        try {
            GraphicsEnvironment ge = GraphicsEnvironment.