Fix merge conflicts

leaphy-robotics · Sep 20, 2023 · bbf31b9 · bbf31b9
2 parents f915610 + 80cf011
commit bbf31b9
Show file tree

Hide file tree

Showing 4 changed files with 2,374 additions and 25,292 deletions.
diff --git a/main.js b/main.js
@@ -105,7 +105,6 @@ function createWindow() {
         },
         icon: image
     })
-
     mainWindow.maximize();
     mainWindow.setMenu(null);
     mainWindow.setMenuBarVisibility(false);