-
-
Notifications
You must be signed in to change notification settings - Fork 69
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
17a6890
commit 06b3c76
Showing
1 changed file
with
65 additions
and
99 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,111 +1,77 @@ | ||
| { | ||
| <<<<<<< HEAD | ||
| "name": "altus", | ||
| "version": "1.2.2", | ||
| "description": "Electron-based desktop wrapper for Whatsapp Web", | ||
| "homepage": "https://github.com/ShadyThGod/altus", | ||
| "bugs": { | ||
| "url": "https://github.com/ShadyThGod/altus/issues" | ||
| }, | ||
| "main": "main.js", | ||
| "scripts": { | ||
| "start": "electron ." | ||
| }, | ||
| "build": { | ||
| "appId": "harwara.aman.altus", | ||
| "productName": "Altus", | ||
| "nsis": { | ||
| "oneClick": "false", | ||
| "artifactName": "${productName}-Setup-${version}.${ext}" | ||
| ||||||| merged common ancestors | ||
| "name": "altus", | ||
| "version": "1.2.1", | ||
| "description": "Electron-based desktop wrapper for Whatsapp Web", | ||
| "homepage": "https://github.com/ShadyThGod/altus", | ||
| "bugs": { | ||
| "url": "https://github.com/ShadyThGod/altus/issues" | ||
| ======= | ||
| "name": "altus", | ||
| "version": "1.2.2", | ||
| "description": "Electron-based desktop wrapper for Whatsapp Web", | ||
| "homepage": "https://github.com/ShadyThGod/altus", | ||
| "bugs": { | ||
| "url": "https://github.com/ShadyThGod/altus/issues" | ||
| >>>>>>> 8181d7d8c912852f38ab5893fd422cdaf54579e5 | ||
| }, | ||
| "win": { | ||
| "target": [ | ||
| { | ||
| "target": "nsis", | ||
| "arch": [ | ||
| "x64", | ||
| "ia32" | ||
| ] | ||
| } | ||
| ], | ||
| "icon": "build/icon.ico" | ||
| }, | ||
| "linux": { | ||
| "category": "Chat", | ||
| "target": [ | ||
| "AppImage", | ||
| "deb" | ||
| ] | ||
| "main": "main.js", | ||
| "scripts": { | ||
| "start": "electron ." | ||
| }, | ||
| "mac": { | ||
| "category": "public.app-category.social-networking", | ||
| "target": [ | ||
| "dmg" | ||
| ] | ||
| }, | ||
| <<<<<<< HEAD | ||
| "dmg": { | ||
| "background": "build/background.png", | ||
| "icon": "build/icon.icns", | ||
| "iconSize": 100, | ||
| "contents": [ | ||
| { | ||
| "x": 380, | ||
| "y": 280, | ||
| "type": "link", | ||
| "path": "/Applications" | ||
| "build": { | ||
| "appId": "harwara.aman.altus", | ||
| "productName": "Altus", | ||
| "nsis": { | ||
| "oneClick": "false", | ||
| "artifactName": "${productName}-Setup-${version}.${ext}" | ||
| }, | ||
| "win": { | ||
| "target": [{ | ||
| "target": "nsis", | ||
| "arch": [ | ||
| "x64", | ||
| "ia32" | ||
| ] | ||
| }], | ||
| "icon": "build/icon.ico" | ||
| }, | ||
| "linux": { | ||
| "category": "Chat", | ||
| "target": [ | ||
| "AppImage", | ||
| "deb" | ||
| ] | ||
| }, | ||
| "mac": { | ||
| "category": "public.app-category.social-networking", | ||
| "target": [ | ||
| "dmg" | ||
| ] | ||
| }, | ||
| "dmg": { | ||
| "background": "build/background.png", | ||
| "icon": "build/icon.icns", | ||
| "iconSize": 100, | ||
| "contents": [{ | ||
| "x": 380, | ||
| "y": 280, | ||
| "type": "link", | ||
| "path": "/Applications" | ||
| }, | ||
| { | ||
| "x": 110, | ||
| "y": 280, | ||
| "type": "file" | ||
| } | ||
| ], | ||
| "window": { | ||
| "width": 500, | ||
| "height": 400 | ||
| } | ||
| }, | ||
| "author": { | ||
| "name": "ShadyThGod", | ||
| "email": "[email protected]" | ||
| }, | ||
| "license": "GNU GPLv3", | ||
| "devDependencies": { | ||
| "electron": "^2.0.8" | ||
| }, | ||
| { | ||
| "x": 110, | ||
| "y": 280, | ||
| "type": "file" | ||
| "dependencies": { | ||
| "mousetrap": "^1.6.2", | ||
| "node-fetch": "^2.2.0" | ||
| } | ||
| ], | ||
| "window": { | ||
| "width": 500, | ||
| "height": 400 | ||
| } | ||
| ||||||| merged common ancestors | ||
| "dependencies": { | ||
| "node-fetch": "^2.2.0" | ||
| ======= | ||
| "dependencies": { | ||
| "mousetrap": "^1.6.2", | ||
| "node-fetch": "^2.2.0" | ||
| >>>>>>> 8181d7d8c912852f38ab5893fd422cdaf54579e5 | ||
| } | ||
| <<<<<<< HEAD | ||
| }, | ||
| "author": { | ||
| "name": "ShadyThGod", | ||
| "email": "[email protected]" | ||
| }, | ||
| "license": "GNU GPLv3", | ||
| "devDependencies": { | ||
| "electron": "^2.0.8" | ||
| }, | ||
| "dependencies": { | ||
| "mousetrap": "^1.6.2", | ||
| "node-fetch": "^2.2.0" | ||
| } | ||
| } | ||
| ||||||| merged common ancestors | ||
| } | ||
| ======= | ||
| } | ||
| >>>>>>> 8181d7d8c912852f38ab5893fd422cdaf54579e5 | ||
| } |