fix: conflict

This commit is contained in:
Aslam H
2024-09-28 19:53:32 +07:00
205 changed files with 8806 additions and 2121 deletions

View File

@@ -1,12 +1,11 @@
{
"productName": "learn-anything",
"productName": "Learn Anything",
"version": "0.1.0",
"identifier": "xyz.learn-anything",
"identifier": "xyz.learnanything.desktop",
"build": {
"frontendDist": "../out",
"frontendDist": "https://dev.learn-anything.xyz",
"devUrl": "http://localhost:3000",
"beforeDevCommand": "bun dev",
"beforeBuildCommand": "bun build"
"beforeDevCommand": "bun dev"
},
"app": {
"windows": [
@@ -15,8 +14,7 @@
"width": 800,
"height": 600,
"resizable": true,
"fullscreen": false,
"url": "http://localhost:3000"
"fullscreen": false
}
],
"security": {