added merge-related fixes

2024-04-08 10:43:53 -06:00
parent 6da81801d4 3db9b0485d
commit e15fff6591
20 changed files with 14 additions and 0 deletions
@@ -189,7 +189,10 @@ 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.