squashed bug

This commit is contained in:
Josh Ashton
2024-04-08 10:56:29 -06:00
parent 4d2d8f99f4
commit e2ac6e437d
-3
View File
@@ -189,10 +189,7 @@ public class Settings {
fontName = "HackNerdFontMono-Regular"; fontName = "HackNerdFontMono-Regular";
fontFilepath = "/usr/share/fonts/TTF/" + fontName + ".ttf"; fontFilepath = "/usr/share/fonts/TTF/" + fontName + ".ttf";
} }
<<<<<<< HEAD
=======
>>>>>>> main
// Register the font with the GraphicsEnvironment. // Register the font with the GraphicsEnvironment.
try { try {
GraphicsEnvironment ge = GraphicsEnvironment. GraphicsEnvironment ge = GraphicsEnvironment.