Merge pull request #6 from SLCC-Programming-Club/nav-gui

GUI
2024-04-08 10:44:27 -06:00
parent 3db9b0485d e15fff6591
commit 41cca317c7
19 changed files with 4 additions and 0 deletions
@@ -189,6 +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.