Resolving Merge Conflict #1

package.json

@@ -1,74 +0,0 @@
-{
-  "name": "Ether1Wallet",
-  "version": "0.3.2",
-  "description": "Desktop wallet for Ether-1 ($ETHO)",
-  "main": "main.js",
-  "scripts": {
-    "start": "electron .",
-    "pack-win": "build --windows --dir",
-    "dist-win": "build --platform=win --arch=x64",
-    "dist-linux": "build --platform=linux --arch=x64",
-    "dist-osx": "build --platform=mac --arch=x64"
-  },
-  "build": {
-    "appId": "Ether1DesktopWallet",
-    "files": [
-      "modules/*",
-      "assets/**/*",
-      "renderer/*",
-      "package.json",
-      "main.js",
-      "index.html"
-    ],
-    "win": {
-      "target": "7z",
-      "icon": "build/icon.png",
-      "artifactName": "Windows-${productName}-${version}.${ext}",
-      "extraResources": [
-        "bin/win/*"
-      ]
-    },
-    "linux": {
-      "target": "tar.gz",
-      "icon": "build/icon.icns",
-      "artifactName": "Linux-${productName}-${version}.${ext}",
-      "extraResources": [
-        "bin/linux/*"
-      ]
-    },
-    "mac": {
-      "target": "pkg",
-      "icon": "build/icon.icns",
-      "artifactName": "MacOS-${productName}-${version}.${ext}",
-      "extraResources": [
-        "bin/macos/*"
-      ]
-    }
-  },
-  "repository": "https://github.com/taeguscromis/Ether1DesktopWallet",
-  "keywords": [
-    "Ether1",
-    "Desktop",
-    "Wallet"
-  ],
-  "author": "Ether1",
-  "license": "CC0-1.0",
-  "dependencies": {
-    "@unibeautify/beautifier-js-beautify": "^0.4.0",
-    "adm-zip": "^0.4.13",
-    "app-root-path": "^2.1.0",
-    "electron-storage": "^1.0.7",
-    "fs-extra": "^7.0.1",
-    "handlebars": ">=4.1.2",
-    "moment": "^2.23.0",
-    "nedb": "^1.8.0",
-    "single-instance": "0.0.1"
-  },
-  "devDependencies": {
-    "electron": "^3.0.12",
-    "electron-builder": "^20.38.3",
-    "js-beautify": "^1.9.0",
-    "unibeautify": "^0.17.0",
-    "unibeautify-cli": "^0.2.1"
-  }
-}