Merge branch 'master' of https://git.ouxuan.net/3136352472/ouxuan.oa

5 years ago · 4bff00b1ea
2 changed files with 1 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -3,3 +3,4 @@ build
 data
 task.json
 username.json
+package-lock.json
--- a/lib/main.js
+++ b/lib/main.js
@ -14,7 +14,6 @@ exports.createMainWindow = function () {
            preload: path.join(__dirname, 'web/main.js')
        }
    })
-
    // and load the index.html of the app.
    exports.MainWindow.loadURL('http://oa.ouxuan.net/?d=we&m=login')